* Re-add --with-tcl and --with-tclinclude.

[sven/mysqltcl.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 1b1dd99e7e43b4f6f5f218341715aa18be06d155..723bf5212a509546c09b2be54d10efa73de96089 100755 (executable)
--- 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
 
 
@@ -62,6 +64,9 @@ install: build
        dh_installdirs
 
        $(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 \