diff options
Diffstat (limited to 'sysutils/bacula/patches/patch-src_filed_Makefile.in')
| -rw-r--r-- | sysutils/bacula/patches/patch-src_filed_Makefile.in | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/sysutils/bacula/patches/patch-src_filed_Makefile.in b/sysutils/bacula/patches/patch-src_filed_Makefile.in new file mode 100644 index 00000000000..7787d57c6d2 --- /dev/null +++ b/sysutils/bacula/patches/patch-src_filed_Makefile.in @@ -0,0 +1,43 @@ +$NetBSD: patch-src_filed_Makefile.in,v 1.1 2012/10/06 17:54:53 christos Exp $ + +- use %%EXAMPLESDIR%% instead of sysconfdir +- use the .la files for linking + +--- src/filed/Makefile.in.orig 2012-09-13 04:51:19.000000000 -0400 ++++ src/filed/Makefile.in 2012-10-05 11:15:25.000000000 -0400 +@@ -96,12 +96,12 @@ + bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + @echo "Linking $@ ..." + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \ + $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) + + static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@ + $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \ +- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \ ++ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) ../findlib/libbacfind.la ../lib/libbacpy.la ../lib/libbaccfg.la ../lib/libbac.la -lm $(PYTHON_LIBS) $(LIBS) \ + $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS) + strip $@ + +@@ -139,16 +139,16 @@ + install: all + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd + @srcconf=bacula-fd.conf; \ +- if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ ++ if test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \ + destconf=$$srcconf.new; \ + echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ + else \ + destconf=$$srcconf; \ + fi; \ +- echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ +- ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf ++ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \ ++ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf + @if test "x${fd_group}" != "x"; then \ +- chgrp -f ${fd_group} ${DESTDIR}${sysconfdir}/$$destconf ; \ ++ chgrp -f ${fd_group} ${DESTDIR}%%EXAMPLESDIR%%/$$destconf ; \ + fi + @if test -f static-bacula-fd; then \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \ |