summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Sikora2005-11-15 14:52:33 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit28c68ab7f3bcc7c161cc17e019e8b6cbff1d33ee (patch)
treed02b2a5c6a5b528a054e2552e5a163301f74a4ca
downloadnf-hipac-28c68ab7f3bcc7c161cc17e019e8b6cbff1d33ee.zip
nf-hipac-28c68ab7f3bcc7c161cc17e019e8b6cbff1d33ee.tar.gz
- fix destdir, cflags, install.
Changed files: nf-hipac-Makefile.patch -> 1.1
-rw-r--r--nf-hipac-Makefile.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/nf-hipac-Makefile.patch b/nf-hipac-Makefile.patch
new file mode 100644
index 0000000..923e572
--- /dev/null
+++ b/nf-hipac-Makefile.patch
@@ -0,0 +1,40 @@
+--- nf-hipac-0.9.1/user/Makefile.orig 2005-10-11 18:49:59.000000000 +0200
++++ nf-hipac-0.9.1/user/Makefile 2005-11-15 15:37:33.854898000 +0100
+@@ -26,20 +26,12 @@
+
+ CFLAGS := -Wall -Wno-long-long -Wstrict-prototypes -Wno-trigraphs \
+ -Wunused -fno-strict-aliasing -fno-common -rdynamic \
+- -D IPT_LIB_DIR=\"$(IPT_LIB_DIR)\"
++ -D IPT_LIB_DIR=\"$(IPT_LIB_DIR)\" $(OPTFLAGS)
+
+ ifeq ($(IPTABLES_1_2), true)
+ CFLAGS += -D IPTABLES_1_2
+ endif
+
+-ifeq ($(DEBUG), true)
+-CFLAGS += -g
+-BINFLAGS := $(CFLAGS) -Wl,-rpath,$(shell pwd)
+-else
+-CFLAGS += -O2 -fomit-frame-pointer
+-BINFLAGS := $(CFLAGS)
+-endif
+-
+ OFLAGS := $(CFLAGS) -fPIC
+ SFLAGS := $(CFLAGS) -shared -nostartfiles
+
+@@ -49,11 +41,10 @@
+ all: $(BIN)
+
+ install: $(BIN)
+- mkdir -p "$(BINDIR)"
+- $(INSTALL) -o root -g root -m 755 $(BIN) $(BINDIR)
+- mkdir -p "$(LIBDIR)"
+- $(INSTALL) -o root -g root -m 755 $(LIB) $(LIBDIR)
+- $(LDCONFIG)
++ mkdir -p "$(DESTDIR)$(BINDIR)"
++ $(INSTALL) -m 755 $(BIN) $(DESTDIR)$(BINDIR)
++ mkdir -p "$(DESTDIR)$(LIBDIR)"
++ $(INSTALL) -m 755 $(LIB) $(DESTDIR)$(LIBDIR)
+
+ nf-hipac: %:%.o -ldl $(LIB) nf-hipac-core.o
+ $(CC) $(BINFLAGS) $^ -o $@