summaryrefslogtreecommitdiff
path: root/sysutils/bacula/patches/patch-ah
blob: 7d6f0b210c1de535e1a9b6b6dc142e50d4d09a32 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
$NetBSD: patch-ah,v 1.5 2009/05/15 10:29:05 adam Exp $

--- src/wx-console/Makefile.in.orig	2009-03-09 16:34:05.000000000 +0100
+++ src/wx-console/Makefile.in
@@ -83,7 +83,7 @@ bwx-console.app: bwx-console
 
 bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
 	$(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) \
-	  -lbaccfg -lbac $(OPENSSL_LIBS)
+	  ../lib/libbaccfg.la ../lib/libbac.la $(OPENSSL_LIBS)
 
 win32: bwx-console_private.res
 	
@@ -114,14 +114,14 @@ install: all
 	fi
 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console
 	@srcconf=bwx-console.conf; \
-	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
+	if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$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}/usr/pkg/share/examples/bacula/$$destconf"; \
+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
 
 uninstall:
 	(cd $(DESTDIR)$(sbindir); $(RMF) bwx-console)