[SCM] ffmpeg2theora/master: Honor CFLAGS, LDFLAGS and CPPFLAGS

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sat Feb 6 21:16:08 UTC 2016


The following commit has been merged in the master branch:
commit 3d4039da51b25457c1b9838daf6bbacfa296222b
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Jan 30 18:06:51 2016 +0100

    Honor CFLAGS, LDFLAGS and CPPFLAGS

diff --git a/debian/rules b/debian/rules
index 28a9672..09d5cb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,18 @@
 #!/usr/bin/make -f
 
-#DEB_SCONS_OPTIONS := prefix=/usr destdir=$(DEB_DESTDIR) mandir=PREFIX/share/man
+DEB_SCONS_OPTIONS := prefix=/usr destdir=$(CURDIR)/debian/ffmpeg2theora mandir=$(CURDIR)
+DEB_SCONS_OPTIONS += APPEND_CCFLAGS="$(CPPFLAGS) $(CFLAGS)"
+DEB_SCONS_OPTIONS += APPEND_LINKFLAGS="$(LDFLAGS)"
 
-#PREFIX="prefix=$(CURDIR)/debian/ffmpeg2theora/usr destdir=$(CURDIR)/debian/ffmpeg2theora mandir=$(CURDIR)/debian/usr/share/man"
 
 %:
 	dh $@ --with quilt
 
-#override_dh_auto_build:
-#	scons
+override_dh_auto_build:
+	scons $(DEB_SCONS_OPTIONS)
 
 override_dh_auto_install:
-	dh_auto_install -- PREFIX="prefix=/usr destdir=$(CURDIR)/debian/ffmpeg2theora mandir=$(CURDIR)"
+	scons install $(DEB_SCONS_OPTIONS)
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
ffmpeg2theora packaging



More information about the pkg-multimedia-commits mailing list