diff options
author | waldemar brodkorb <wbx@debian-lenny-amd64.foo.bar> | 2010-01-19 21:14:16 +0100 |
---|---|---|
committer | waldemar brodkorb <wbx@debian-lenny-amd64.foo.bar> | 2010-01-19 21:14:16 +0100 |
commit | dd181acc1ac0c1e7dc9db85da30bd8522a95773d (patch) | |
tree | 08396068cfd74178f725d4b096a321d54ae8a53e /package/mdadm/patches/patch-Makefile | |
parent | fc4027a2b4f5a9384e8552b8dd515e53aae9444c (diff) | |
parent | a903c4fefdc19bb838e808146c6aa1a32296e4cb (diff) |
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
Diffstat (limited to 'package/mdadm/patches/patch-Makefile')
-rw-r--r-- | package/mdadm/patches/patch-Makefile | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/package/mdadm/patches/patch-Makefile b/package/mdadm/patches/patch-Makefile index 585f6730b..79b801c74 100644 --- a/package/mdadm/patches/patch-Makefile +++ b/package/mdadm/patches/patch-Makefile @@ -1,6 +1,16 @@ --- mdadm-3.0.orig/Makefile 2009-06-02 07:48:29.000000000 +0200 -+++ mdadm-3.0/Makefile 2009-12-11 19:01:17.000000000 +0100 -@@ -186,29 +186,36 @@ sha1.o : sha1.c sha1.h md5.h ++++ mdadm-3.0/Makefile 2010-01-16 09:36:14.000000000 +0100 +@@ -58,7 +58,8 @@ CONFFILE = $(SYSCONFDIR)/mdadm.conf + CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf + MAILCMD =/usr/sbin/sendmail -t + CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" +-CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) ++CFLAGS ?= ++CFLAGS += $(CWFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) + + # If you want a static binary, you might uncomment these + # LDFLAGS = -static +@@ -186,29 +187,36 @@ sha1.o : sha1.c sha1.h md5.h $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c install : mdadm mdmon install-man install-udev |