Changeset 633 for branches

Timestamp:

Nov 3, 2014, 1:51:23 AM (5 years ago)

Author:

ehem

Message:

Pass $(CC) and $(CFLAGS) to the OpenWRT Makefile on the command-line.
This overrides these variables in the Makefile, obviating the need to
patch the file.
In the override_dh_auto_install, move to removing the .svn directories in
the package image directory, instead of the checked out source directory.
This makes it more obvious that the source isn't being modified, this is
merely cleanup for the Debian package.

Location:

branches/contrib/debian/package-host/libnl-tiny

Files:

• debian/rules (modified) (3 diffs)
• patches (deleted)

branches/contrib/debian/package-host/libnl-tiny/debian/rules

@@ -12 +12 @@
 DEB_HOST_GNU_TYPE?=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 CC=$(DEB_HOST_GNU_TYPE)-gcc
-export CC
+CFLAGS=-O2 -fPIC
 
 %:
@@ -21 +21 @@
         dh_auto_configure
 
-        $(MAKE) -C src
+        $(MAKE) CC:='$(CC)' CFLAGS:='$(CFLAGS)' -C src
 
         dh_auto_test
@@ -28 +28 @@
         install -d debian/libnl-tiny/usr/lib
         install src/libnl-tiny.so debian/libnl-tiny/usr/lib/libnl-tiny.so
-        install -d debian/libnl-tiny-dev/usr/include/netlink-tiny
-        -find src/include/ -type d -name ".svn" -exec rm -rf {} \;
-        cp -a src/include/* debian/libnl-tiny-dev/usr/include/netlink-tiny
+        install -d debian/libnl-tiny-dev/usr/include
+        cp -arl src/include debian/libnl-tiny-dev/usr/include/netlink-tiny
+        find debian/libnl-tiny-dev/usr/include/netlink-tiny -type d -name .svn -prune -print0 | xargs -0 rm -rf
 
 override_dh_auto_clean: