[SCM] Git repository for devscripts branch, master, updated. v2.11.7-70-g0cdc6f4

[Benjamin Drung]

The following commit has been merged in the master branch:
commit 0cdc6f43037d0c0f4a9ab2216f1b696d87420cfa
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun Jun 17 20:26:47 2012 +0200

    Use dpkg-buildflags for C code.

diff --git a/debian/changelog b/debian/changelog
index f73264a..be0ca89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ devscripts (2.11.9) UNRELEASED; urgency=low
   [ Benjamin Drung ]
   * debchange: Use the Dpkg::Vendor Perl API directly to avoid the overhead
     of the command line dpkg-vendor script.
+  * Use dpkg-buildflags for C code.
 
  -- David Prévot <taffit at debian.org>  Thu, 31 May 2012 12:12:02 -0400
 
diff --git a/scripts/Makefile b/scripts/Makefile
index 91066f6..71f08b0 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -13,6 +13,10 @@ VERSION := $(shell cat $(VERSION_FILE))
 PL_FILES := $(wildcard *.pl)
 SH_FILES = $(wildcard *.sh)
 LIBS = libvfork.so.0
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += -std=c99
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 CWRAPPERS = debpkg-wrapper
 SCRIPTS = $(patsubst %.pl,%,$(PL_FILES)) $(patsubst %.sh,%,$(SH_FILES))
 COMPL_FILES := $(wildcard *.bash_completion)
@@ -60,9 +64,9 @@ devscripts.%: %.bash_completion
 	cp $< $@
 
 libvfork.o: libvfork.c
-	$(CC) -fPIC -D_REENTRANT $(CFLAGS) -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -D_REENTRANT -c $<
 libvfork.so.0: libvfork.o
-	$(CC) -shared $< -lc -Wl,-soname -Wl,libvfork.so.0 -o $@
+	$(CC) $(LDFLAGS) -shared $< -lc -Wl,-soname -Wl,libvfork.so.0 -o $@
 
 clean:
 	python setup.py clean -a

-- 
Git repository for devscripts