summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-07-17 17:08:30 +0200
committerVolker Lendecke <vl@samba.org>2010-07-17 19:58:21 +0200
commita7e6b2aeb4a5ae3bf575c14bf866544b975d5f0b (patch)
tree41853afc9b5f71c11bad7aa86b01a5e4f2359599
parentb7a1dd69804e19971b23fc4ebff3bb7234abfad7 (diff)
downloadsamba-a7e6b2aeb4a5ae3bf575c14bf866544b975d5f0b.tar.gz
samba-a7e6b2aeb4a5ae3bf575c14bf866544b975d5f0b.tar.bz2
samba-a7e6b2aeb4a5ae3bf575c14bf866544b975d5f0b.zip
s3: Right now we do not have includes in Makefile.in
Skip the expansion step on non-GNU-make systems
-rw-r--r--source3/configure.in12
1 files changed, 1 insertions, 11 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 4c17e4c928..6157f373a2 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6855,17 +6855,7 @@ if test -f Makefile-noincludes -a ! -f Makefile -a ! -h Makefile ; then
fi
])
-AC_SUBST(MAKEFILE)
-if test x$samba_cv_gnu_make = xyes; then
- MAKEFILE=Makefile
-else
- # When we don't have GNU Make, generate a copy of Makefile.in
- # that doesn't have the "include " statements but just includes
- # the files verbatim.
- MAKEFILE=Makefile-noincludes
- $PERL ./script/expand-includes.pl Makefile.in > $MAKEFILE.in
-fi
-AC_OUTPUT($MAKEFILE
+AC_OUTPUT(Makefile
script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh script/uninstallbin.sh
lib/netapi/examples/Makefile
lib/netapi/tests/Makefile