summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rwxr-xr-xautogen.sh8
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 5e004148..00ea568a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,8 +31,7 @@ endif
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = \
- config.rpath \
+EXTRA_DIST = config.rpath \
fontconfig.pc.in \
fonts.conf.in \
fonts.dtd \
diff --git a/autogen.sh b/autogen.sh
index e7eff72f..9984c76b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -50,7 +50,7 @@ GPERF=${GPERF-gperf}
PYTHON=${PYTHON-python}
LIBTOOLIZE_FLAGS="--copy --force"
GETTEXTIZE=${GETTEXTIZE-gettextize}
-GETTEXTIZE_FLAGS="--force"
+GETTEXTIZE_FLAGS="--force --no-changelog"
DIE=0
@@ -141,8 +141,14 @@ if test -z "$AUTOGEN_SUBDIR_MODE" -a -z "$NOCONFIGURE"; then
fi
fi
+[ -f configure.ac~ ] && rm configure.ac~
echo Running $GETTEXTIZE $GETTEXTIZE_FLAGS
$GETTEXTIZE $GETTEXTIZE_FLAGS
+# revert changes from gettextize for workaround...
+[ -f configure.ac~ ] && mv configure.ac~ configure.ac
+echo Running $GETTEXTIZE $GETTEXTIZE_FLAGS --po-dir=po-conf
+$GETTEXTIZE $GETTEXTIZE_FLAGS --po-dir=po-conf
+[ -f configure.ac~ ] && mv configure.ac~ configure.ac
echo Running $ACLOCAL $ACLOCAL_FLAGS
$ACLOCAL $ACLOCAL_FLAGS