mirror of
https://git.freebsd.org/ports.git
synced 2025-05-14 08:11:50 -04:00
5184e60e40
- Add SCSICRYPTO option (2) - Fix /var/run/bareos ownership (1) - Add support for bareos-traymonitor PR: 210177(1) 213834(2)
35 lines
1.7 KiB
Text
35 lines
1.7 KiB
Text
--- src/console/Makefile.in 2016-10-16 10:14:36.000000000 -0500
|
|
+++ src/console/Makefile.in 2016-11-16 01:14:33.054997000 -0500
|
|
@@ -28,6 +28,7 @@
|
|
CONS_LIBS = @CONS_LIBS@
|
|
|
|
JANSSON_CPPFLAGS = @JANSSON_INC@
|
|
+JANSSON_LDFLAGS = @JANSSON_LIBS@
|
|
|
|
INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
|
|
|
|
@@ -51,12 +52,12 @@
|
|
bconsole: Makefile $(CONSOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
|
|
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
|
|
$(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \
|
|
- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
|
|
+ $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
|
|
|
|
static-bconsole: Makefile $(CONSOBJS) ../lib/libbareos.a ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
|
|
$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
|
|
- $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_LIBS) \
|
|
- $(OPENSSL_LIBS) $(GNUTLS_LIBS)
|
|
+ $(DLIB) -lbareoscfg -lbareos -lm $(CONS_LIBS) $(LIBS) $(GETTEXT_STATIC_LIBS) \
|
|
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS)
|
|
strip $@
|
|
|
|
|
|
@@ -93,7 +94,7 @@
|
|
$(MKDIR) $(DESTDIR)$(bindir)
|
|
$(MKDIR) $(DESTDIR)$(sbindir)
|
|
$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bconsole $(DESTDIR)$(bindir)/bconsole;
|
|
- @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) $(bindir)/bconsole $(DESTDIR)$(sbindir)/bconsole; fi
|
|
+ @if ! [ -r $(DESTDIR)$(sbindir)/bconsole ]; then $(SYMLINK) ../bin/bconsole $(DESTDIR)$(sbindir)/bconsole; fi
|
|
@srcconf=bconsole.conf; \
|
|
if test -f ${DESTDIR}${confdir}/$$srcconf; then \
|
|
destconf=$$srcconf.new; \
|