X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fmysqltcl.git;a=blobdiff_plain;f=debian%2Frules;h=723bf5212a509546c09b2be54d10efa73de96089;hp=61fb953d0e8199f4a3793a2154561b7ee4ff3ac3;hb=c63923c6c2f72ffb5fb771cb42cf10400918c4f1;hpb=19e3e5ae82f8f85ee94d082a2ca5de842d14032d

diff --git a/debian/rules b/debian/rules
index 61fb953..723bf52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,16 +19,18 @@ CONFIGURE_OPTIONS += \
 		--enable-threads \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--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
 
 
@@ -61,7 +63,10 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/mysqltcl/
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/mysqltcl
+	mkdir $(CURDIR)/debian/mysqltcl/usr/lib/tcltk
+	mv $(CURDIR)/debian/mysqltcl/usr/lib/mysqltcl* \
+		$(CURDIR)/debian/mysqltcl/usr/lib/tcltk
 	rm -rf \
 		$(CURDIR)/debian/mysqltcl/usr/share/man/mann \
 		$(CURDIR)/debian/mysqltcl/usr/bin \