Sophie

Sophie

distrib > Altlinux > 4.1 > i586 > media > core-src > by-pkgid > 4a5036422606065e77c6d542d52747e4 > files > 3

qtcl-1.2-alt6.src.rpm

diff -urN qtcl-1.2.orig/configure.in qtcl-1.2/configure.in
--- qtcl-1.2.orig/configure.in	2005-10-29 10:17:14 +0300
+++ qtcl-1.2/configure.in	2006-05-23 13:57:31 +0300
@@ -9,7 +9,7 @@
 AC_PROG_INSTALL
 
 AC_ARG_WITH(tcl,
-    [  --with-tcl=<directory>         directory containing lib/tclConfig.sh],
+    [  --with-tcl=<directory>         directory containing tclConfig.sh],
     [TCLDIR=$withval],
     [TCLDIR=/usr])
 
@@ -23,7 +23,7 @@
     [KDEDIR=$withval],
     [KDEDIR=$prefix])
 
-file=${TCLDIR}/lib/tclConfig.sh
+file=${TCLDIR}/tclConfig.sh
 . $file
 
 CC="g++ -Wall -pedantic -Wno-long-long -W -fPIC -Wno-non-virtual-dtor"
diff -urN qtcl-1.2.orig/kde/Makefile.in qtcl-1.2/kde/Makefile.in
--- qtcl-1.2.orig/kde/Makefile.in	2004-08-09 12:29:15 +0300
+++ qtcl-1.2/kde/Makefile.in	2006-05-23 14:05:11 +0300
@@ -9,8 +9,8 @@
 INSTALL=@INSTALL@
 CDEBUGFLAGS=-O2
 
-CFLAGS=-DUSE_COMPAT_CONST $(QTDEFINES) $(CDEBUGFLAGS) -I.. -I$(KDEDIR)/include -I$(QTDIR)/include -I$(QTDIR)/mkspecs/$(QTPLATFORM) -I$(TCLDIR)/include
-LDFLAGS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -L$(TCLDIR)/lib -L/usr/X11R6/lib
+CFLAGS=-DUSE_COMPAT_CONST $(QTDEFINES) $(CDEBUGFLAGS) -I.. -I$(KDEDIR)/include -I$(QTDIR)/include -I$(QTDIR)/mkspecs/$(QTPLATFORM) -I/usr/include
+LDFLAGS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -L$(TCLDIR) -L/usr/X11R6/lib
 LDLIBS=-lkdecore -lkdeui -lqui -lqt-mt -lpthread -ltcl$(TCL_VERSION) -lm
 
 MOC=$(QTDIR)/bin/moc
@@ -41,7 +41,7 @@
 	rm -f libktcl.a libktcl.so
 
 install:: all
-	$(INSTALL) libktcl.a libktcl.so $(prefix)/lib
+	$(INSTALL) libktcl.a libktcl.so $(libdir)
 
 libktcl.a: $(OBJS)
 	rm -f $@
diff -urN qtcl-1.2.orig/qtcl/Makefile.in qtcl-1.2/qtcl/Makefile.in
--- qtcl-1.2.orig/qtcl/Makefile.in	2004-08-09 12:29:15 +0300
+++ qtcl-1.2/qtcl/Makefile.in	2006-05-23 14:02:22 +0300
@@ -8,8 +8,8 @@
 
 CDEBUGFLAGS=-O2
 
-LDFLAGS=-L$(QTDIR)/lib -L$(TCLDIR)/lib -L/usr/X11R6/lib
-CFLAGS=-DUSE_COMPAT_CONST $(CDEBUGFLAGS) $(QTDEFINES) -I$(QTDIR)/include -I$(QTDIR)/mkspecs/default -I$(TCLDIR)/include
+LDFLAGS=-L$(QTDIR)/lib -L$(TCLDIR) -L/usr/X11R6/lib
+CFLAGS=-DUSE_COMPAT_CONST $(CDEBUGFLAGS) $(QTDEFINES) -I$(QTDIR)/include -I$(QTDIR)/mkspecs/default -I/usr/include
 LDLIBS=-lqui -lqt-mt -lpthread -ltcl$(TCL_VERSION) -lm
 
 MOC=$(QTDIR)/bin/moc
@@ -39,7 +39,7 @@
 	rm -f libqtcl.a libqtcl.so
 
 install:: all
-	$(INSTALL) libqtcl.a libqtcl.so $(prefix)/lib
+	$(INSTALL) libqtcl.a libqtcl.so $(libdir)
 
 libqtcl.a: $(OBJS)
 	rm -f $@
diff -urN qtcl-1.2.orig/widgets/Makefile.in qtcl-1.2/widgets/Makefile.in
--- qtcl-1.2.orig/widgets/Makefile.in	2004-08-09 12:29:15 +0300
+++ qtcl-1.2/widgets/Makefile.in	2006-05-23 14:01:35 +0300
@@ -32,7 +32,7 @@
 	rm -f $(PLUGIN)
 
 install:: all
-	$(INSTALL) $(PLUGIN) $(prefix)/lib/kde3/plugins/designer
+	$(INSTALL) $(PLUGIN) $(libdir)/kde3/plugins/designer
 
 $(PLUGIN): $(OBJS)
 	rm -f $@