b1806eba48
My thanks to Larry Rosenman who did all the heavy lifting on this patch. The existing port relied heavily upon an agressive sed which seems to have adverse affects. Submitted by: ler@lerctr.org PR: 193641 193617 Approved by: mat (mentor)
26 lines
1.5 KiB
Text
26 lines
1.5 KiB
Text
--- src/filed/Makefile.in.orig 2015-08-13 13:52:24 UTC
|
|
+++ src/filed/Makefile.in
|
|
@@ -65,12 +65,12 @@ acl.o: acl.c
|
|
|
|
bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
|
@echo "Linking $@ ..."
|
|
- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
|
|
+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) -L../lib -L../findlib $(LDFLAGS) -o $@ $(SVROBJS) \
|
|
$(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
|
|
$(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
|
|
|
|
static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
|
|
- $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
|
|
+ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) -static -L../lib -L../findlib $(LDFLAGS) -o $@ $(SVROBJS) \
|
|
$(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
|
|
$(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
|
|
strip $@
|
|
@@ -127,7 +127,7 @@ uninstall:
|
|
depend:
|
|
@$(MV) Makefile Makefile.bak
|
|
@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
|
|
- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
|
|
+ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
|
|
@$(CXX) -S -M $(CPPFLAGS) $(XINC) $(LZO_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
|
|
@if test -f Makefile ; then \
|
|
$(RMF) Makefile.bak; \
|