Package: cdbs
Version: 0.4.52
Severity: wishlist
Tags: patch
For packages that include a directory with m4 files for generating
aclocal.mk with a different name than m4/ (I've seen macros/ and config/
in various packages), it would be useful to have an option that replaces
$(DEB_SRCDIR)/m4 with e.g. $(DEB_SRCDIR)/$(if
$(DEB_ACLOCAL_M4_DIR),$(DEB_ACLOCAL_M4_DIR),m4) in
/usr/share/cdbs/1/class/autotools-files.mk.
I've attached a patch that does this.
-Tim Abbottdiff -ur cdbs-0.4.52.orig/1/class/autotools-files.mk.in cdbs-0.4.52/1/class/autotools-files.mk.in
--- cdbs-0.4.52.orig/1/class/autotools-files.mk.in 2008-03-28 11:20:22.000000000 -0400
+++ cdbs-0.4.52/1/class/autotools-files.mk.in 2008-05-30 20:20:34.000000000 -0400
@@ -44,10 +44,14 @@
endif
endif
+ifeq ($(DEB_ACLOCAL_M4_DIR), )
+DEB_ACLOCAL_M4_DIR = m4
+endif
+
common-configure-arch common-configure-indep:: debian/stamp-autotools-files
debian/stamp-autotools-files:
$(if $(filter pre,$(DEB_AUTO_UPDATE_LIBTOOL)),cd $(DEB_SRCDIR) && libtoolize -c -f)
- $(if $(DEB_AUTO_UPDATE_ACLOCAL),if [ -d $(DEB_SRCDIR)/m4 ]; then m4="-I m4"; fi; if [ -e $(DEB_SRCDIR)/aclocal.m4 ]; then cd $(DEB_SRCDIR) && aclocal-$(DEB_AUTO_UPDATE_ACLOCAL) $$m4; fi,$(if $(DEB_AUTO_UPDATE_AUTOMAKE), if [ -d $(DEB_SRCDIR)/m4 ]; then m4="-I m4"; fi; if [ -e $(DEB_SRCDIR)/aclocal.m4 ]; then cd $(DEB_SRCDIR) && aclocal-$(DEB_AUTO_UPDATE_AUTOMAKE) $$m4; fi))
+ $(if $(DEB_AUTO_UPDATE_ACLOCAL),if [ -d $(DEB_SRCDIR)/$(DEB_ACLOCAL_M4_DIR) ]; then m4="-I $(DEB_ACLOCAL_M4_DIR)"; fi; if [ -e $(DEB_SRCDIR)/aclocal.m4 ]; then cd $(DEB_SRCDIR) && aclocal-$(DEB_AUTO_UPDATE_ACLOCAL) $$m4; fi,$(if $(DEB_AUTO_UPDATE_AUTOMAKE), if [ -d $(DEB_SRCDIR)/$(DEB_ACLOCAL_M4_DIR) ]; then m4="-I $(DEB_ACLOCAL_M4_DIR)"; fi; if [ -e $(DEB_SRCDIR)/aclocal.m4 ]; then cd $(DEB_SRCDIR) && aclocal-$(DEB_AUTO_UPDATE_AUTOMAKE) $$m4; fi))
$(if $(DEB_AUTO_UPDATE_AUTOCONF),if [ -e $(DEB_SRCDIR)/configure.ac ] || [ -e $(DEB_SRCDIR)/configure.in ]; then cd $(DEB_SRCDIR) && `which autoconf$(DEB_AUTO_UPDATE_AUTOCONF) || which autoconf`; fi)
$(if $(DEB_AUTO_UPDATE_AUTOHEADER),if [ -e $(DEB_SRCDIR)/configure.ac ] || [ -e $(DEB_SRCDIR)/configure.in ]; then cd $(DEB_SRCDIR) && `which autoheader$(DEB_AUTO_UPDATE_AUTOHEADER) || which autoheader` ; fi)
$(if $(DEB_AUTO_UPDATE_AUTOMAKE),if [ -e $(DEB_SRCDIR)/Makefile.am ]; then cd $(DEB_SRCDIR) && automake-$(DEB_AUTO_UPDATE_AUTOMAKE) $(DEB_AUTOMAKE_ARGS) ; fi)
