sync debian rules from 2.1.3~rc5-4+nmu1.1 in order to get multiarch and install .pc file
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
diff --git a/Makefile.am b/Makefile.am
index 92498d0..f99cd88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src test demo docs
+SUBDIRS = src demo # test (does not build) # docs (overflows pdflatex)
DIST_SUBDIRS = $(SUBDIRS) msvc
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/debian/libftgl-dev.install b/debian/libftgl-dev.install
index ab4a612..69e1c7e 100644
--- a/debian/libftgl-dev.install
+++ b/debian/libftgl-dev.install
@@ -1,9 +1,9 @@
usr/include
-#usr/lib/lib*.a
-usr/lib/lib*.so
-#usr/lib/pkgconfig/*.pc
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*.pc
#usr/share/doc/libftgl-dev/html
#usr/share/doc/libftgl-dev/ftgl.pdf
#usr/share/doc/libftgl-dev/*.txt
#/usr/share/cmake-2.8/Modules/FindFTGL.cmake
-/usr/lib/cmake/FTGL/*.cmake
+#/usr/lib/cmake/FTGL/*.cmake
diff --git a/debian/libftgl2.install b/debian/libftgl2.install
index d0dbfd1..3ddde58 100644
--- a/debian/libftgl2.install
+++ b/debian/libftgl2.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index f86b61a..914f537 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
CFLAGS = -Wall -g
DTMPDIR = $(CURDIR)/debian/tmp
@@ -22,33 +24,34 @@ configure: configure-stamp
configure-stamp:
dh_testdir
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-# ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+ dh_autoreconf
+ ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
touch $@
+build-arch: build
+build-indep: build
build: build-stamp
build-stamp: configure-stamp
dh_testdir
-# $(MAKE) CFLAGS="$(CFLAGS)"
- mkdir -p $(CURDIR)/build-debian
- (cd $(CURDIR)/build-debian; cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:STRING=Release ..)
-
- (cd $(CURDIR)/build-debian; $(MAKE) )
+ $(MAKE) CFLAGS="$(CFLAGS)" GLUT_LIBS="$(GLUT_LIBS) -lglut -lGLU -lGL -lm"
touch $@
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- rm -rf $(CURDIR)/build-debian
[ ! -f Makefile ] || $(MAKE) distclean
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ dh_autoreconf_clean
dh_clean
install: build
dh_testdir
dh_testroot
dh_clean -k
- (cd $(CURDIR)/build-debian; $(MAKE) install DESTDIR=$(DTMPDIR) )
+ $(MAKE) install DESTDIR=$(DTMPDIR)
# mv debian/tmp/usr/share/doc/ftgl debian/tmp/usr/share/doc/libftgl-dev
dh_install --list-missing --sourcedir=debian/tmp
@@ -88,4 +91,4 @@ binary-arch: build install
dh_builddeb -a
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure