39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
diff -Nru ebtables-v2.0.8-rc3-orig/Makefile ebtables-v2.0.8-rc3/Makefile
|
|
--- ebtables-v2.0.8-rc3-orig/Makefile 2007-02-18 19:35:42.228506482 +0200
|
|
+++ ebtables-v2.0.8-rc3/Makefile 2007-02-18 20:09:33.866567357 +0200
|
|
@@ -12,15 +12,15 @@
|
|
|
|
# default paths
|
|
LIBDIR:=/usr/lib
|
|
-MANDIR:=/usr/local/man
|
|
-BINDIR:=/usr/local/sbin
|
|
+MANDIR:=/usr/man
|
|
+BINDIR:=/usr/sbin
|
|
ETCDIR:=/etc
|
|
-INITDIR:=/etc/rc.d/init.d
|
|
+INITDIR:=/etc/rc.d
|
|
SYSCONFIGDIR:=/etc/sysconfig
|
|
DESTDIR:=
|
|
|
|
# include DESTDIR param
|
|
-override LIBDIR:=$(DESTDIR)$(LIBDIR)/$(PROGNAME)
|
|
+override LIBDIR:=$(DESTDIR)$(LIBDIR)
|
|
override MANDIR:=$(DESTDIR)$(MANDIR)
|
|
override BINDIR:=$(DESTDIR)$(BINDIR)
|
|
override ETCDIR:=$(DESTDIR)$(ETCDIR)
|
|
@@ -167,11 +167,11 @@
|
|
.PHONY: scripts
|
|
scripts: ebtables-save ebtables.sysv ebtables-config
|
|
cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
|
|
- install -m 0755 -o root -g root ebtables-save_ $(BINDIR)/ebtables-save
|
|
+ install -D -m 0755 -o root -g root ebtables-save_ $(BINDIR)/ebtables-save
|
|
cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
|
|
- install -m 0755 -o root -g root ebtables.sysv_ $(INITDIR)/ebtables
|
|
+ install -D -m 0755 -o root -g root ebtables.sysv_ $(INITDIR)/ebtables
|
|
cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
|
|
- install -m 0600 -o root -g root ebtables-config_ $(SYSCONFIGDIR)/ebtables-config
|
|
+ install -D -m 0600 -o root -g root ebtables-config_ $(SYSCONFIGDIR)/ebtables-config
|
|
rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
|
|
|
|
$(MANDIR)/man8/ebtables.8: ebtables.8
|