Don't put in SUBDIRS dir without Makefile

autoconf260.m4 has moved

diff --git a/Makefile.am b/Makefile.am
index 57938f3497f030682ec127387f24efeee2e865ee..3aba9330d4b65d3a5e7e061bc945e0ca0de9ab49 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 #  - libs/* are needed by modules
 SUBDIRS = po libs/loader libs/srtp src modules \
                projects/mozilla bindings projects/activex share doc
-DIST_SUBDIRS = $(SUBDIRS) extras/buildsystem/autotools/m4 extras/package/ipkg
+DIST_SUBDIRS = $(SUBDIRS)  extras/package/ipkg
 
 EXTRA_DIST = \
        HACKING \

diff --git a/bootstrap b/bootstrap
index 07130be0f6ef217987dd271b7149c6a37cb43305..b1ccf14514ea008e15bdeaec05a4c2b0c445a82c 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -63,7 +63,7 @@ case "$(autoreconf --version|head -n 1)" in
     echo "Enabling provisional autoconf 2.59 work-around. Update autoconf ASAP."
     echo "Press Enter to continue"
     read
-    cp -f extras/m4/autoconf260.m4 m4/
+    cp -f extras/buildsystem/autotools/m4/autoconf260.m4 m4/
     ;;
 esac