X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Ftop.mk;h=58b250d924133e86250a21cb5f4e00185e93059d;hb=3ae4b383d5acac6977ba834ddf9ba77b1d805024;hp=75aedba61109b5dc6fb3b7b3e04cba67244bf9cc;hpb=67391ff6465320bdd9dd8f887b492d4223a662e7;p=openldap

diff --git a/build/top.mk b/build/top.mk
index 75aedba611..58b250d924 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-## Copyright 1998-2004 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -49,10 +49,12 @@ OBJEXT = @OBJEXT@
 
 BUILD_LIBS_DYNAMIC = @BUILD_LIBS_DYNAMIC@
 
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+SHTOOL = $(top_srcdir)/build/shtool
+
+INSTALL = $(SHTOOL) install -c
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_SCRIPT = $(INSTALL)
 
 LINT = lint
 5LINT = 5lint
@@ -64,8 +66,6 @@ MKDEP_CFLAGS = @OL_MKDEP_FLAGS@
 
 MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 
-SHTOOL = $(top_srcdir)/build/shtool
-
 LIBTOOL = @LIBTOOL@
 LIBRELEASE = @OPENLDAP_LIBRELEASE@
 LIBVERSION = @OPENLDAP_LIBVERSION@
@@ -97,7 +97,7 @@ LTFLAGS_MOD = $(@PLAT@_LTFLAGS_MOD)
 
 # platform-specific LINK_LIBS defined in various Makefile.in files.
 # LINK_LIBS referenced in library and module link commands.
-LINK_LIBS = $(@PLAT@_LINK_LIBS)
+LINK_LIBS = $(MOD_LIBS) $(@PLAT@_LINK_LIBS)
 
 LTSTATIC = @LTSTATIC@
 
@@ -125,17 +125,19 @@ BASENAME = basename
 CAT = cat
 CHMOD = chmod
 DATE = date
+ECHO = $(SHTOOL) echo
 HOSTNAME = $(SHTOOL) echo -e "%h%d"
-LN = ln
-LN_H = @LN_H@
-LN_S = @LN_S@
+LN = $(SHTOOL) mkln
+LN_H = $(LN)
+LN_S = $(LN) -s
 MAKEINFO = @MAKEINFO@
 MKDIR = $(SHTOOL) mkdir -p
-MV = mv
+MV = $(SHTOOL) move
 PWD = pwd
 RANLIB = @RANLIB@
 RM = rm -f
 SED = sed
+SUBST = $(SHTOOL) subst
 
 # For manual pages
 # MANCOMPRESS=@MANCOMPRESS@
@@ -191,7 +193,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
 SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
 SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@
 
-SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@
+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
 SLURPD_LIBS = @SLURPD_LIBS@
 
 # Our Defaults