Commit 55000f09 authored by Axel Beckert's avatar Axel Beckert

Move stuff from clean to configure target, don't remove files, just move them away

parent 2e0fa1fe
......@@ -17,6 +17,8 @@ ifneq "$(findstring debug,$(DEB_BUILD_OPTIONS))" ""
CFLAGS += -g
endif
export AUTOMAKE=automake-1.9
include /usr/share/quilt/quilt.make
build: build-arch build-indep
......@@ -34,6 +36,15 @@ GETTEXT_PO_FILES= Makefile.in.in Rules-quot boldquot.sed \
quot.sed remove-potcdate.sin
configure-stamp: $(QUILT_STAMPFN)
# Move everything we don't need away
mkdir -pv debian/not-needed-for-build/src/
# Not needed, B-D on getext, likely should be removed
mv -vi intl debian/not-needed-for-build/
# Why this?
mv -vi src/ltdl.* debian/not-needed-for-build/src/
# In the future, an external PCRE should be used if possible
#mv -vi pcre debian/not-needed-for-build/
test -d m4 || mkdir m4
for f in ${GETTEXT_TOP_FILES}; do \
cp -f /usr/share/gettext/$$f .; \
......@@ -42,8 +53,9 @@ configure-stamp: $(QUILT_STAMPFN)
cp -f /usr/share/gettext/po/$$f po/; \
done
ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 \
autoreconf -fvi -Im4
dh_autoreconf
#ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 \
# autoreconf -fvi -Im4
CFLAGS="$(CFLAGS)" ./configure $(confflags) \
--without-included-ltdl \
......@@ -56,13 +68,22 @@ configure-stamp: $(QUILT_STAMPFN)
clean:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
rm -rf autom4te.cache intl m4
# Generated stuff
rm -rf autom4te.cache m4
cd po && rm -f ${GETTEXT_PO_FILES} stamp-po
rm -f src/ltdl.* ${GETTEXT_TOP_FILES} \
aclocal.m4 config.guess config.h.in config.sub configure depcomp \
install-sh ltmain.sh missing mkinstalldirs
find . -name Makefile.in | xargs -r rm
rm -f ${GETTEXT_TOP_FILES}
# Generated stuff, should be replaced by dh-reconf or so
dh_autoreconf_clean
[ ! -f Makefile ] || $(MAKE) distclean
# Restore as much as possible for easy VCS usage
[ ! -d debian/not-needed-for-build/src/ ] || mv -vi debian/not-needed-for-build/src/* src/
[ ! -d debian/not-needed-for-build/src/ ] || rmdir -v debian/not-needed-for-build/src
[ ! -d debian/not-needed-for-build/ ] || mv -vi debian/not-needed-for-build/* ./
[ ! -d debian/not-needed-for-build/ ] || rmdir -v debian/not-needed-for-build/
#rm -f \
# aclocal.m4 config.guess config.h.in config.sub configure depcomp \
# install-sh ltmain.sh missing mkinstalldirs
#find . -name Makefile.in | xargs -r rm
dh_clean build-stamp configure-stamp
$(MAKE) -f debian/rules unpatch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment