Avoid build tools messing with VCS or packaging

Last-Update: 2016-05-25

Last-Update: 2016-05-25
Gbp-Pq: Name 2002_avoid_upstream_git_or_pkg.patch

diff --git a/Makefile.am b/Makefile.am
index bd4287b8f5fe0c8a2fd2af2238e63c07f84f8783..2643cdb6020029ab41aa2effa647dfe57add3729 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@ GITIGNOREFILES = \
 AM_CPPFLAGS =
 AM_LDFLAGS =
 
-BUILT_SOURCES = uthash/src
 EXTRA_DIST =
 CLEANFILES =
 MOSTLYCLEANFILES =
@@ -114,7 +113,6 @@ EXTRA_DIST += \
        Packaging/FontForge-doc.spec \
        Packaging/FontForge.spec \
        Packaging/FontForge.static.spec \
-       uthash/src \
        $(NULL)
 
 #--------------------------------------------------------------------------
@@ -127,22 +125,3 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-theme-2012 --enable-debug
 #      --without-libtiff --without-libxml --without-libspiro   \
 #      --without-libuninameslist --without-libunicodenames     \
 #      --without-libzmq  --without-libreadline
-
-
-#--------------------------------------------------------------------------
-uthash/src:
-       if [ ! -e uthash/src ]; then \
-       if [ -e uthash ] ; then rm -r uthash ; fi ; \
-       git clone https://github.com/troydhanson/uthash ; \
-       fi ;
-
-# We import a selection of targets from Frank's standard packaging Makefile.
-
-# automake can't parse certain parts of Makefile syntax,
-# and there isn't an easy way to make it copy things that it doesn't
-# understand without grouching, so we use a sneaky trick, specifically
-# a blank macro from configure.ac so as to bypass evaluation.
-
-@BLANK2@-include $(top_srcdir)/pkg.mk
-
--include $(top_srcdir)/git.mk

diff --git a/configure.ac b/configure.ac
index a755cd650ad15a2e22e6e3685b7bc82de4a5f5f3..99e60b6886e21ec350c8b7b846dfe80f3525ad29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -762,9 +762,9 @@ AC_CONFIG_FILES([tests/atlocal])
 # Collect "GIT" compile-time information to help when debugging FontForge.
 
 FONTFORGE_GIT_VERSION=""
-if test -d ${srcdir}/.git; then
-  FONTFORGE_GIT_VERSION=`cd ${srcdir} && git log --pretty=format:'%H' -n 1`
-fi
+dnl if test -d ${srcdir}/.git; then
+dnl   FONTFORGE_GIT_VERSION=`cd ${srcdir} && git log --pretty=format:'%H' -n 1`
+dnl fi
 FONTFORGE_DATE_NOW=${SOURCE_DATE_EPOCH:-$(date +'%s')}
 FONTFORGE_DATE_OPTS="--date=@${FONTFORGE_DATE_NOW}"
 if ! date --version 2>/dev/null ; then

diff --git a/fontforge/Makefile.am b/fontforge/Makefile.am
index bcff69aea3cf995e31090cd4afec84f2f505d9f9..424d9852161fe1039efde358c5a2210334557a6c 100644 (file)
--- a/fontforge/Makefile.am
+++ b/fontforge/Makefile.am
@@ -121,7 +121,6 @@ AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = "-I$(top_builddir)/inc" "-I$(top_srcdir)/inc"            \
        "-I$(top_builddir)/lib" "-I$(top_srcdir)/lib"                   \
        "-DSHAREDIR=\"${MY_SHAREDIR}\"" "-DDOCDIR=\"${MY_DOCDIR}\""     \
-       "-I$(top_builddir)/uthash/src" "-I$(top_srcdir)/uthash/src"     \
        "-DFF_UTHASH_GLIF_NAMES=1"                                      \
        "-DPLUGINDIR=\"${MY_PLUGINDIR}\"" $(MY_CFLAGS)