X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Fmod.mk;h=2e3510d0a5e13b31a92f62c563d0cc72edb06c1f;hb=9405761404afb4af791137fb7cf73cf32c7e7e22;hp=5fb0624485321a0f52c8b4d7bb304315ab1211ae;hpb=adfd6865fe25b3612341c8f4e66104315793cd28;p=openldap

diff --git a/build/mod.mk b/build/mod.mk
index 5fb0624485..2e3510d0a5 100644
--- a/build/mod.mk
+++ b/build/mod.mk
@@ -1,4 +1,5 @@
-## Copyright 1998,1999 The OpenLDAP Foundation
+# $OpenLDAP$
+## Copyright 1998-2000 The OpenLDAP Foundation
 ## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
 ## of this package for details.
 ##---------------------------------------------------------------------------
@@ -8,9 +9,15 @@
 
 LIBRARY = $(LIBBASE).la
 LIBSTAT = lib$(LIBBASE).a
-LTFLAGS = --only-$(LINKAGE)
 
-all-no lint-no 5lint-no depend-no install-no:
+MKDEPFLAG = -l
+
+.SUFFIXES: .c .o .lo
+
+.c.lo:
+	$(LTCOMPILE_MOD) $<
+
+all-no lint-no 5lint-no depend-no install-no: FORCE
 	@echo "run configure with $(BUILD_OPT) to make $(LIBBASE)"
 
 all-common: all-$(BUILD_MOD)
@@ -20,7 +27,7 @@ version.c: $(OBJS)
 	$(MKVERSION) $(LIBBASE) > $@
 
 $(LIBRARY): version.lo
-	$(LTLIBLINK) -module -rpath $(moduledir) -o $@ $(OBJS) version.lo
+	$(LTLINK_MOD) -module -o $@ $(OBJS) version.lo $(LINK_LIBS)
 
 $(LIBSTAT): version.lo
 	$(AR) ruv $@ `echo $(OBJS) | sed 's/\.lo/.o/g'` version.o
@@ -45,8 +52,8 @@ all-local-lib:
 all-yes: $(LIBSTAT) all-local-lib FORCE
 
 install-mod: $(LIBRARY)
-	@-$(MKDIR) $(moduledir)
-	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(moduledir)
+	@-$(MKDIR) $(DESTDIR)$(moduledir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 $(LIBRARY) $(DESTDIR)$(moduledir)
 
 install-local-lib:
 install-yes: install-local-lib FORCE
@@ -70,12 +77,5 @@ depend-yes depend-mod: depend-local-lib FORCE
 veryclean-local-lib:
 veryclean-lib: 	clean-lib veryclean-local-lib
 
-COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) -c
-MKDEPFLAG = -l
-
-.SUFFIXES: .c .o .lo
-
-.c.lo:
-	$(COMPILE) $<
-
 Makefile: $(top_srcdir)/build/mod.mk
+