X-Git-Url: http://git.sven.stormbind.net/?a=blobdiff_plain;f=debian%2Frules;h=82b2120390fb728c250307a6c2cf2d7868019582;hb=eefeec2c754fafab48b2f14a957969eccfc38889;hp=1045a76ef37836e5433b466197499bdda99fc1a5;hpb=98977bfc1c0c698bc74c13d73042c2727bc61fed;p=sven%2Ftclcurl.git

diff --git a/debian/rules b/debian/rules
index 1045a76..82b2120 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ CONFIGURE_OPTIONS += \
 	--prefix=/usr \
 	--mandir=/usr/share/man \
 	--infodir=/usr/share/info \
-	--enable-threads
+	--enable-threads \
 
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
@@ -26,9 +26,9 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 CFLAGS += -Wall -g
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O2
-else
         CFLAGS += -O0
+else
+        CFLAGS += -O2
 endif
 
 
@@ -36,8 +36,8 @@ configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
 
-        CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-        ./configure $(CONFIGURE_OPTIONS)
+	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	./configure $(CONFIGURE_OPTIONS)
 
 	touch configure-stamp
 
@@ -51,8 +51,8 @@ clean: cleaner unpatch
 cleaner:
 	dh_testdir
 	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f build-stamp configure-stamp   
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 
 install: build
@@ -60,8 +60,16 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tclcurl
-	dh_movefiles
+	mkdir $(CURDIR)/debian/tclcurl/usr/lib/tcltk
+	mv $(CURDIR)/debian/tclcurl/usr/lib/TclCurl* \
+		$(CURDIR)/debian/tclcurl/usr/lib/tcltk
+	rm -rf \
+		$(CURDIR)/debian/tclcurl/usr/share/man/mann \
+		$(CURDIR)/debian/tclcurl/usr/bin \
+		$(CURDIR)/debian/tclcurl/usr/include
+
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -86,5 +94,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep build clean configure install
+.PHONY: build clean binary-indep binary-arch binary install configure