Branch: master

6458202b 2014-12-28 01:13:08 Timothy Pearson
Fix libr packaging FTBFS
M debian/lenny/dependencies/libr/debian/rules
M debian/squeeze/dependencies/libr/debian/rules
M ubuntu/maverick/dependencies/libr/debian/rules
diff --git a/debian/lenny/dependencies/libr/debian/rules b/debian/lenny/dependencies/libr/debian/rules
index 7314f03..53fe01c 100755
--- a/debian/lenny/dependencies/libr/debian/rules
+++ b/debian/lenny/dependencies/libr/debian/rules
@@ -32,6 +32,13 @@
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
+configure:
+	cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
+	cp -Rp /usr/share/libtool/libltdl/aclocal.m4 aclocal.m4
+	autoconf
+	automake
+
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
@@ -41,10 +48,6 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
-	cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
-	autoconf
-	automake
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 
diff --git a/debian/squeeze/dependencies/libr/debian/rules b/debian/squeeze/dependencies/libr/debian/rules
index 7314f03..53fe01c 100755
--- a/debian/squeeze/dependencies/libr/debian/rules
+++ b/debian/squeeze/dependencies/libr/debian/rules
@@ -32,6 +32,13 @@
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
+configure:
+	cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
+	cp -Rp /usr/share/libtool/libltdl/aclocal.m4 aclocal.m4
+	autoconf
+	automake
+
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
@@ -41,10 +48,6 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
-	cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
-	autoconf
-	automake
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 
diff --git a/ubuntu/maverick/dependencies/libr/debian/rules b/ubuntu/maverick/dependencies/libr/debian/rules
index 7314f03..53fe01c 100755
--- a/ubuntu/maverick/dependencies/libr/debian/rules
+++ b/ubuntu/maverick/dependencies/libr/debian/rules
@@ -32,6 +32,13 @@
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
+configure:
+	cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
+	cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
+	cp -Rp /usr/share/libtool/libltdl/aclocal.m4 aclocal.m4
+	autoconf
+	automake
+
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
@@ -41,10 +48,6 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	cp -Rp /usr/share/aclocal/libtool.m4 libtool.m4.in
-	cp -Rp /usr/share/libtool/config/ltmain.sh ltmain.sh
-	autoconf
-	automake
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"