[bwm-tools-devel] COMMIT - r6 - in trunk: bwm_firewall bwmd

[<bwm...@li...>]

Author: nkukard
Date: 2004-12-28 17:09:01 +0200 (Tue, 28 Dec 2004)
New Revision: 6

Modified:
   trunk/bwm_firewall/Makefile.am
   trunk/bwm_firewall/Makefile.in
   trunk/bwmd/Makefile.am
   trunk/bwmd/Makefile.in
Log:
* Fixed build tools to use /etc ... etc, even if we have a different prefix


Modified: trunk/bwm_firewall/Makefile.am
===================================================================
--- trunk/bwm_firewall/Makefile.am	2004-12-23 20:07:27 UTC (rev 5)
+++ trunk/bwm_firewall/Makefile.am	2004-12-28 15:09:01 UTC (rev 6)
@@ -27,13 +27,13 @@
 XML_CFLAGS=@XML_CFLAGS@
 
 # Config stuff...
-CONFIG_DIR=$(sysconfdir)/bwm_tools
+CONFIG_DIR=/etc/bwm_tools
 CONFIG_FILE=$(CONFIG_DIR)/firewall.xml
 
 
 bin_PROGRAMS = bwm_firewall
 bwm_firewall_SOURCES = bwm_firewall.c
 bwm_firewall_LDADD = $(top_builddir)/lib/libbwm.la
-bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS)
+bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"/etc/sysconfig/iptables\" $(AM_CFLAGS)
 bwm_firewall_LDFLAGS = $(GLIB_LIBS) $(XML_LIBS) -lpanel -lncurses -lmenu
 

Modified: trunk/bwm_firewall/Makefile.in
===================================================================
--- trunk/bwm_firewall/Makefile.in	2004-12-23 20:07:27 UTC (rev 5)
+++ trunk/bwm_firewall/Makefile.in	2004-12-28 15:09:01 UTC (rev 6)
@@ -199,11 +199,11 @@
 EXTRA_DIST = bwm_firewall.h
 
 # Config stuff...
-CONFIG_DIR = $(sysconfdir)/bwm_tools
+CONFIG_DIR = /etc/bwm_tools
 CONFIG_FILE = $(CONFIG_DIR)/firewall.xml
 bwm_firewall_SOURCES = bwm_firewall.c
 bwm_firewall_LDADD = $(top_builddir)/lib/libbwm.la
-bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"$(sysconfig)/sysconfig/iptables\" $(AM_CFLAGS)
+bwm_firewall_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DIPTABLES_FILE=\"/etc/sysconfig/iptables\" $(AM_CFLAGS)
 bwm_firewall_LDFLAGS = $(GLIB_LIBS) $(XML_LIBS) -lpanel -lncurses -lmenu
 all: all-am
 

Modified: trunk/bwmd/Makefile.am
===================================================================
--- trunk/bwmd/Makefile.am	2004-12-23 20:07:27 UTC (rev 5)
+++ trunk/bwmd/Makefile.am	2004-12-28 15:09:01 UTC (rev 6)
@@ -23,9 +23,9 @@
 XML_LIBS=@XML_LIBS@
 XML_CFLAGS=@XML_CFLAGS@
 
-CONFIG_DIR=$(sysconfdir)/bwm_tools
+CONFIG_DIR=/etc/bwm_tools
 CONFIG_FILE=$(CONFIG_DIR)/firewall.xml
-LOG_DIR=@localstatedir@/bwm_tools
+LOG_DIR=/var/bwm_tools
 
 bin_PROGRAMS = bwmd
 bwmd_SOURCES = report.c flowControl.c bwmd.c

Modified: trunk/bwmd/Makefile.in
===================================================================
--- trunk/bwmd/Makefile.in	2004-12-23 20:07:27 UTC (rev 5)
+++ trunk/bwmd/Makefile.in	2004-12-28 15:09:01 UTC (rev 6)
@@ -197,9 +197,9 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-CONFIG_DIR = $(sysconfdir)/bwm_tools
+CONFIG_DIR = /etc/bwm_tools
 CONFIG_FILE = $(CONFIG_DIR)/firewall.xml
-LOG_DIR = @localstatedir@/bwm_tools
+LOG_DIR = /var/bwm_tools
 bwmd_SOURCES = report.c flowControl.c bwmd.c
 bwmd_LDADD = $(top_builddir)/lib/libbwm.la
 bwmd_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(XML_CFLAGS) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DLOG_DIR=\"$(LOG_DIR)\" $(AM_CFLAGS)