Fix problems with the Debian package

diff --git a/ToDo b/ToDo
index 6ebf1066a275e13f1a7ba33d42e3c88e97ad9d6f..c1f0e8122512137af7c12b893f77505d660ee0ba 100644 (file)
--- a/ToDo
+++ b/ToDo
@@ -1,2 +1,3 @@
 - Write manpage
-- Catch SIGINT in `oping'
+- Rename `liboping.h' to `oping.h'
+

diff --git a/debian/rules b/debian/rules
index 02f7d0b2c04ad3af4fbf1f5f203d32e5ca50cbab..b663c35b47624df1c0ef05d80a2432c0d80299f6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-CFLAGS = -Wall -Werror -g
+CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
@@ -67,7 +67,7 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
        cp -f /usr/share/misc/config.guess config.guess
 endif
-
+       rm -rf $(CURDIR)/debian/tmp || true
 
        dh_clean 
 
@@ -88,9 +88,13 @@ install-arch:
        dh_testdir
        dh_testroot
        dh_clean -k -s 
-       dh_installdirs -s
+       dh_installdirs --all
 
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/liboping
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+       mv -v $(CURDIR)/debian/tmp/usr/lib/*.so $(CURDIR)/debian/liboping/usr/lib/
+       mv -v $(CURDIR)/debian/tmp/usr/lib/*.{a,la} $(CURDIR)/debian/liboping-dev/usr/lib/
+       mv -v $(CURDIR)/debian/tmp/usr/include/*.h $(CURDIR)/debian/liboping-dev/usr/include/
+       mv -v $(CURDIR)/debian/tmp/usr/bin/* $(CURDIR)/debian/oping/usr/bin/
 
        dh_install -s
 # Must not depend on anything. This is to be called by