summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-06-25 19:06:59 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-06-25 19:06:59 +0200
commitda5c4143f8e80d522880bc8dedef6387e17429f6 (patch)
tree4dd55efaf6a88851446805db9199976a4d08bfca
parent750297a6d9057e2b4c2c7cabfc7c5748290bc351 (diff)
downloadsamba-da5c4143f8e80d522880bc8dedef6387e17429f6.tar.gz
samba-da5c4143f8e80d522880bc8dedef6387e17429f6.tar.bz2
samba-da5c4143f8e80d522880bc8dedef6387e17429f6.zip
Use variable for popt source dir.
(This used to be commit effc25e805facea001ebd64d383f1a536c61d0e3)
-rw-r--r--source4/Makefile1
-rw-r--r--source4/lib/popt/config.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 37d601f4f3..1889ba2d5e 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -71,6 +71,7 @@ smbreadlinesrcdir := lib/smbreadline
libmessagingsrcdir := lib/messaging
libeventssrcdir := lib/events
libcmdlinesrcdir := lib/cmdline
+poptsrcdir := lib/popt
socketwrappersrcdir := lib/socket_wrapper
nsswrappersrcdir := lib/nss_wrapper
appwebsrcdir := lib/appweb
diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk
index 86d440ac78..e015577aea 100644
--- a/source4/lib/popt/config.mk
+++ b/source4/lib/popt/config.mk
@@ -1,5 +1,5 @@
[SUBSYSTEM::LIBPOPT]
CFLAGS = -Ilib/popt
-LIBPOPT_OBJ_FILES = $(addprefix lib/popt/, findme.o popt.o poptconfig.o popthelp.o poptparse.o)
+LIBPOPT_OBJ_FILES = $(addprefix $(poptsrcdir)/, findme.o popt.o poptconfig.o popthelp.o poptparse.o)