Remove LDAP_PORT dependencies so that ldap.conf defaults take over.

[openldap] / libraries / libldap / Makefile.in

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 009ff875689a4efbc8151e9aacf1c5bbd472f5e7..484a8f3f70308416208e3def5c2e534d0fd11478 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -31,18 +31,23 @@ ltest:      $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
 ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
        $(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
 
-CFFILES= ldap.conf ldapfilter.conf ldapfriendly \
-       ldaptemplates.conf ldapsearchprefs.conf
+CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
 
 install-local: $(CFFILES) FORCE
-       -$(MKDIR) -p $(libdir)
+       -$(MKDIR) $(libdir)
        $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
-       -$(MKDIR) -p $(sysconfdir)
+       -$(MKDIR) $(sysconfdir)
        @for i in $(CFFILES); do \
-               echo "installing $$i in $(sysconfdir)"; \
-               if test -f $(sysconfdir)/$$i; then \
-                       $(MV) $(sysconfdir)/$$i $(sysconfdir)/$$i-; \
+               if test ! -f $(sysconfdir)/$$i; then \
+                       echo "installing $$i in $(sysconfdir)"; \
+                       echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i"; \
+                       $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i; \
+               else \
+                       echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
                fi; \
-               $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir); \
+               $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i.default; \
        done
+       -$(MKDIR) $(datadir)
+       -$(MV) $(datadir)/ldapfriendly $(datadir)/ldapfriendly-
+       $(INSTALL) $(INSTALLFLAGS) -m 644 ldapfriendly $(datadir)/ldapfriendly