brielle
/
SRFirewall
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Update some of the debian files

master
bbruns 2014-04-12 15:35:21 +00:00
parent ad59361e2e
commit 2568517245
3 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/patches/01-deb-install-location.patch vendored
View File

@ -1,13 +0,0 @@
Index: srfirewall-2.0a1+svn20140408/bin/srfirewall
===================================================================
--- srfirewall-2.0a1+svn20140408.orig/bin/srfirewall 2014-04-08 18:55:30.209705751 -0600
+++ srfirewall-2.0a1+svn20140408/bin/srfirewall 2014-04-08 19:22:51.369154162 -0600
@@ -22,7 +22,7 @@
FW_VERSION="2.0 PreAlpha 1"
# Important directory locations
-FWPREFIX="/usr/local"
+FWPREFIX="/usr"
FWCONFIGDIR="${FWPREFIX}/etc/srfirewall"
FWLIBDIR="${FWPREFIX}/lib/srfirewall"
FWBINDIR="${FWPREFIX}/bin"

24
debian/patches/01-deb-makefile-install-location.patch vendored
View File

@ -1,24 +0,0 @@
Index: srfirewall-2.0a1+svn20140408/Makefile
===================================================================
--- srfirewall-2.0a1+svn20140408.orig/Makefile 2014-04-08 19:49:20.440285374 -0600
+++ srfirewall-2.0a1+svn20140408/Makefile 2014-04-08 19:49:31.160360827 -0600
@@ -1,14 +1,14 @@
-PREFIX=/usr/local
+PREFIX=/usr
all: # Nothing here
install:
mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/lib/srfirewall \
- $(DESTDIR)$(PREFIX)/etc/srfirewall
+ $(DESTDIR)/etc/srfirewall
cp -r bin/* $(DESTDIR)$(PREFIX)/bin/
cp -r lib/* $(DESTDIR)$(PREFIX)/lib/srfirewall/
- cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/
+ cp -r etc/* $(DESTDIR)/etc/srfirewall/
install-docs:
mkdir -p $(DESTDIR)$(PREFIX)/share/doc/srfirewall
- cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall
\ No newline at end of file
+ cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall

35
debian/patches/01-location.patch vendored Normal file
View File

@ -0,0 +1,35 @@
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PREFIX=/usr/local
+PREFIX=/usr
all: # Nothing here
@@ -7,11 +7,11 @@
$(DESTDIR)$(PREFIX)/etc/srfirewall
cp -r bin/* $(DESTDIR)$(PREFIX)/bin/
cp -r lib/* $(DESTDIR)$(PREFIX)/lib/srfirewall/
- if [ ! -e $(DESTDIR)$(PREFIX)/etc/srfirewall/main.conf ]; then cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/; fi
+ if [ ! -e $(DESTDIR)/etc/srfirewall/main.conf ]; then cp -r etc/* $(DESTDIR)/etc/srfirewall/; fi
install-etc:
- cp -r etc/* $(DESTDIR)$(PREFIX)/etc/srfirewall/
+ cp -r etc/* $(DESTDIR)/etc/srfirewall/
install-docs:
mkdir -p $(DESTDIR)$(PREFIX)/share/doc/srfirewall
- cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall
\ No newline at end of file
+ cp -r ChangeLog doc/* License ReadMe $(DESTDIR)$(PREFIX)/share/doc/srfirewall
--- a/bin/srfirewall
+++ b/bin/srfirewall
@@ -22,7 +22,7 @@
FW_VERSION="2.0 Alpha 2"
# Important directory locations
-FWPREFIX="/usr/local"
+FWPREFIX="/usr"
FWCONFIGDIR="${FWPREFIX}/etc/srfirewall"
FWLIBDIR="${FWPREFIX}/lib/srfirewall"
FWBINDIR="${FWPREFIX}/bin"