Fix libtqt-perl from building smoke support when tdebindings has that support.

This resolves bug report 1269.

2 files changed, 9 insertions, 9 deletions

diff --git a/PerlTQt/INSTALL b/PerlTQt/INSTALL
index b243233..da1c2dc 100644
--- a/PerlTQt/INSTALL
+++ b/PerlTQt/INSTALL
@@ -4,9 +4,9 @@ http://mail.kde.org/mailman/listinfo/kde-perl or send a subscribe message
 to kde-perl-request@mail.kde.org. Please send patches and bug reports
 to the mailing-list.
 
-This file contains instructions for downloading and building the SmokeTQt
+This file contains instructions for downloading and building the SmokeQt
 library and PerlTQt. PerlTQt is not a direct Perl interface to the TQt
-library, but is rather an interface to the SmokeTQt library generated by
+library, but is rather an interface to the SmokeQt library generated by
 Kalyptus.
 
 The programs+version I use, but not necessarily required:
@@ -21,7 +21,7 @@ Make sure your $TQTDIR environment-variable is set.
 I'm sorry for all the requirements, but you *are* getting this from 
 CVS. Release versions will be much easier and more independant.
 
-First, you need to download the development environment for smoketqt.
+First, you need to download the development environment for smokeqt.
 Please use compression for cvs downloads ('cvs -z4' in .cvsrc).
 
 $ export CVSROOT=:pserver:anonymous@anoncvs.kde.org:/home/kde
@@ -32,7 +32,7 @@ $ cvs co kdebindings/smoke    # pre-generated smoke library
 $ cd kdebindings              # kdebindings/
 $ cvs co admin                # get kde build tools
 
-At this point, you now have the full smoketqt environment. The
+At this point, you now have the full smokeqt environment. The
 pre-generated smoke library is based off KDE's copy of TQt-3.0.4. I have
 TQt-3.0.1, so I have to re-generate the files to match my installed 
 version of TQt. Here's how to do it.
@@ -41,7 +41,7 @@ $ cd smoke/qt                 # kdebindings/smoke/qt/
 $ perl ./qtguess.pl           # simple script to find disabled TQt features
 $ perl ./generate.pl          # calls kalyptus which generates code
 
-Now you have the SmokeTQt source-code generated for your personal TQt
+Now you have the SmokeQt source-code generated for your personal TQt
 configuration. Here's how to compile.
 
 $ cd ../..                    # kdebindings/
@@ -51,7 +51,7 @@ $ cd smoke                    # kdebindings/smoke/
 $ make                        # this should succeed
 $ make install                # will install to --prefix from configure
 
-Okay, you now have libsmoketqt installed on your system. You can now
+Okay, you now have libsmokeqt installed on your system. You can now
 compile PerlTQt. First, get the latest version of PerlTQt-3.
 
 $ export CVSROOT=:pserver:anonymous@cvs.perlqt.sf.net:/cvsroot/perlqt
@@ -59,7 +59,7 @@ $ cvs login                   # no password
 $ cvs co PerlTQt-3
 $ cd PerlTQt-3                 # PerlTQt-3/
 
-If you installed libsmoketqt in a non-standard library path, you will
+If you installed libsmokeqt in a non-standard library path, you will
 need to edit Makefile.PL and add -L/your/lib/path to the LIBS
 parameter. If any of the other options in Makefile.PL need changing for
 your system, you will need to change it now.
diff --git a/PerlTQt/Makefile.PL.in b/PerlTQt/Makefile.PL.in
index bcf72af..7746d30 100644
--- a/PerlTQt/Makefile.PL.in
+++ b/PerlTQt/Makefile.PL.in
@@ -85,7 +85,7 @@ WriteMakefile(
     'VERSION_FROM'	=> 'TQt.pm', # finds $VERSION
     'PREREQ_PM'		=> {}, # e.g., Module::Name => 1.1,
     'INC'		=> '@all_includes@ -I. -I../smoke',
-    'LIBS'		=> ['@all_libraries@'." -L$localsmoke -lsmoketqt ".'@LIBCRYPT@'." $qtlib"],
+    'LIBS'		=> ['@all_libraries@'." -L$localsmoke -lsmokeqt ".'@LIBCRYPT@'." $qtlib"],
 #   'XS'		=> {'TQt.xs' => 'TQt.cpp'}, # does not work ... still expects TQt.c 
     'XSOPT'		=> "-C++",
     'OBJECT'		=> "$objects",  # Object files
@@ -116,7 +116,7 @@ sub MY::const_loadlibs {
                    package MY;
                    my $i = shift->SUPER::const_loadlibs(@_);
                    # hacks for linking against a non-yet-installed smoke
-                   $i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmoketqt\n/gs unless $i =~/-lsmoketqt/;
+                   $i =~ s/((?:EXTRALIBS|LDLOADLIBS).*?)\n/$1 -L$localsmoke -lsmokeqt\n/gs unless $i =~/-lsmokeqt/;
                    $i =~ s#(LD_RUN_PATH.*?)(${localsmoke})?\n#"$1".($2?"":":")."$x{'libdir'}\n"#se;
                    $i;
 }