r25968: ldb: we need to use @SONAMEFLAG@ directly so that the '#' trick can work

metze
(This used to be commit 48957e4b2acd1c19c5be42c6de77eba190dfd7e2)

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index f69fcb8ed67832cec43eeef24e1ebea963768ea8..aff258a39591bd6dd143395ec12d9b68c501bcb9 100644 (file)
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -35,7 +35,6 @@ LDAP_LIBS = @LDAP_LIBS@
 LIBDL = @LIBDL@
 
 SHLIBEXT = @SHLIBEXT@
-SONAMEFLAG = @SONAMEFLAG@
 
 LD_EXPORT_DYNAMIC = @LD_EXPORT_DYNAMIC@
 SHLD_FLAGS = @SHLD_FLAGS@
@@ -97,7 +96,7 @@ SOLIB = lib/libldb.$(SHLIBEXT).0.9.0
 STATICLIB = lib/libldb.a
 
 $(SOLIB): $(OBJS)
-       $(CC) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) $(SONAMEFLAG)$(SONAME) 
+       $(CC) $(SHLD_FLAGS) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) $(TALLOC_LIBS) $(TDB_LIBS) @SONAMEFLAG@$(SONAME)
 
 all: showflags dirs $(OBJS) $(STATICLIB) $(SOLIB) $(BINS) $(EXAMPLES) manpages
 
@@ -124,7 +123,7 @@ lib/libldb.a: $(OBJS)
        @-ranlib $@
 
 lib/libnss_ldb.$(SHLIBEXT).2: $(NSS_OBJ) $(LIBS) bin/libldb.a
-       $(CC) $(SHLD_FLAGS) $(SONAMEFLAG)libnss_ldb.$(SHLIBEXT).2 -o lib/libnss_ldb.$(SHLIBEXT).2 $(NSS_OBJ) $(OBJS) $(LIB_FLAGS)
+       $(CC) $(SHLD_FLAGS) -o lib/libnss_ldb.$(SHLIBEXT).2 $(NSS_OBJ) $(OBJS) $(LIB_FLAGS) @SONAMEFLAG@libnss_ldb.$(SHLIBEXT).2
 
 sample_module.$(SHLIBEXT): tests/sample_module.o 
        $(CC) $(SHLD_FLAGS) $(LDFLAGS) -o $@ tests/sample_module.o