diff options
| -rw-r--r-- | source4/Makefile | 2 | ||||
| -rw-r--r-- | source4/build/m4/env.m4 | 3 | ||||
| -rw-r--r-- | source4/heimdal_build/internal.m4 | 4 | ||||
| -rw-r--r-- | source4/heimdal_build/internal.mk | 2 | ||||
| -rw-r--r-- | source4/main.mk | 1 |
5 files changed, 9 insertions, 3 deletions
diff --git a/source4/Makefile b/source4/Makefile index fba06ccfa9..93e3ceb72f 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -10,8 +10,6 @@ include mkconfig.mk pidldir := $(srcdir)/pidl -VPATH = $(builddir):$(srcdir):$(srcdir)/heimdal_build:$(heimdalsrcdir)/lib/asn1:$(heimdalsrcdir)/lib/krb5:$(heimdalsrcdir)/lib/gssapi:$(heimdalsrcdir)/lib/hdb:$(heimdalsrcdir)/lib/roken:$(heimdalsrcdir)/lib/des - BASEDIR = $(prefix) TORTUREDIR = $(libdir)/torture SWATDIR = $(datadir)/swat diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4 index 9510a8ee0d..6c040b9bab 100644 --- a/source4/build/m4/env.m4 +++ b/source4/build/m4/env.m4 @@ -16,6 +16,9 @@ export builddir; AC_SUBST(datarootdir) +AC_SUBST(VPATH) +VPATH="\$(builddir):\$(srcdir)" + SMB_VERSION_STRING=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2` echo "SAMBA VERSION: ${SMB_VERSION_STRING}" diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4 index e1e495d69b..f83fdf7460 100644 --- a/source4/heimdal_build/internal.m4 +++ b/source4/heimdal_build/internal.m4 @@ -255,3 +255,7 @@ if test t$ac_cv_func_getprogname != tyes; then SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, YES) SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_H, YES) fi + +VPATH="$VPATH:\$(HEIMDAL_VPATH)" + +SMB_INCLUDE_MK(heimdal_build/internal.mk) diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk index 264a5c2f1c..81c90c8ea2 100644 --- a/source4/heimdal_build/internal.mk +++ b/source4/heimdal_build/internal.mk @@ -1,5 +1,7 @@ heimdalbuildsrcdir = $(heimdalsrcdir)/../heimdal_build +HEIMDAL_VPATH = $(heimdalbuildsrcdir):$(heimdalsrcdir)/lib/asn1:$(heimdalsrcdir)/lib/krb5:$(heimdalsrcdir)/lib/gssapi:$(heimdalsrcdir)/lib/hdb:$(heimdalsrcdir)/lib/roken:$(heimdalsrcdir)/lib/des + ####################### # Start SUBSYSTEM HEIMDAL_KDC [SUBSYSTEM::HEIMDAL_KDC] diff --git a/source4/main.mk b/source4/main.mk index f0ce9685f9..28db54c10f 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -1,5 +1,4 @@ mkinclude dynconfig/config.mk -mkinclude heimdal_build/internal.mk mkinclude config.mk mkinclude dsdb/config.mk mkinclude smbd/config.mk |