X-Git-Url: https://git.sven.stormbind.net/?a=blobdiff_plain;f=debian%2Frules;h=733c00840cb946829fc5686732b5540cff513969;hb=e0526816fa95528fbc8b212c311bb2cc268d42b7;hp=b059de0b9bea232eec26135edd0feefcf10125e9;hpb=476c8e654a822761433b85815b02f7245fc25bbf;p=sven%2Ftclcurl.git

diff --git a/debian/rules b/debian/rules
index b059de0..733c008 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,17 +18,19 @@ CONFIGURE_OPTIONS += \
 	--prefix=/usr \
 	--mandir=/usr/share/man \
 	--infodir=/usr/share/info \
-	--enable-threads
+	--enable-threads \
+	--with-tcl=/usr/lib \
+	--with-tclinclude=/usr/include/tcl \
 
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-CFLAGS += -Wall -g
+CFLAGS = -Wall -g
 
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -O2
-else
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0
+else
+        CFLAGS += -O2
 endif
 
 
@@ -36,8 +38,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
 
@@ -62,6 +64,14 @@ install: build
 	dh_installdirs
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tclcurl
+	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 +96,4 @@ binary-arch: build install
 	dh_builddeb
 
 binary: binary-indep binary-arch
-
-.PHONY: build clean binary-arch binary-indep binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure