UNDO LAST COMMIT.

[openldap] / build / top.mk

diff --git a/build/top.mk b/build/top.mk
index 33315ba045a2e9e79e42f655c3cc26f7445888cb..a72be162659b1cc11acce333ea958946de1006b6 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -1,4 +1,3 @@
-##
 ## Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
 ## All rights reserved.
 ##
@@ -20,19 +19,19 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-
 ldap_subdir = @ldap_subdir@
-bindir = @bindir@
-datadir = @datadir@/$(ldap_subdir)
-includedir = @includedir@
-infodir = @infodir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@/$(ldap_subdir)
+
+bindir = $(TMPROOT)@bindir@
+datadir = $(TMPROOT)@datadir@/$(ldap_subdir)
+includedir = $(TMPROOT)@includedir@
+infodir = $(TMPROOT)@infodir@
+libdir = $(TMPROOT)@libdir@
+libexecdir = $(TMPROOT)@libexecdir@
+localstatedir = $(TMPROOT)@localstatedir@
+mandir = $(TMPROOT)@mandir@
+sbindir = $(TMPROOT)@sbindir@
+sharedstatedir = $(TMPROOT)@sharedstatedir@
+sysconfdir = $(TMPROOT)@sysconfdir@/$(ldap_subdir)
 
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@
@@ -60,6 +59,7 @@ CHMOD = chmod
 DATE = date
 HOSTNAME = uname -n
 LN = ln
+LN_H = @LN_H@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDIR = mkdir -p
@@ -109,7 +109,7 @@ SLAPD_LIBDEPEND = $(LDAP_LIBDEPEND) $(LDAP_LIBAVL_DEPEND) \
 # AutoConfig generated 
 AC_CC  = @CC@
 AC_CFLAGS = @CFLAGS@
-AC_DEFS = @CPPFLAGS@ @DEFS@
+AC_DEFS = @CPPFLAGS@ # @DEFS@
 AC_LDFLAGS = @LDFLAGS@
 AC_LIBS = @LIBS@
 
@@ -125,9 +125,9 @@ SLURPD_LIBS = @SLURPD_LIBS@
 # Our Defaults
 CC = $(AC_CC)
 DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)
-LIBS = $(LDAP_LIBPATH) $(XLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS)
 CFLAGS = $(AC_CFLAGS) $(DEFS)
-LDFLAGS = $(AC_LDFLAGS) $(XLDFLAGS)
+LDFLAGS = $(LDAP_LIBPATH) $(AC_LDFLAGS) $(XLDFLAGS)
+LIBS = $(XLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS)
 
 all:           all-common all-local FORCE
 install:       install-common install-local FORCE