[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kdoctools
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-02-18 14:48:48
[Download RAW message or body]

CVS commit by mueller: 

revert last


  M +1 -3      Makefile.am   1.53
  M +1 -5      xslt.cpp   1.61


--- kdelibs/kdoctools/Makefile.am  #1.52:1.53
@@ -1,8 +1,6 @@
 
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kioslave -I$(top_srcdir)/kioslave/bzip2 \
                $(all_includes) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
-
-
 AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries)
-AM_CPPFLAGS = -DSRCDIR="\"@abs_top_srcdir@/kdoctools\""
+AM_CPPFLAGS = -DSRCDIR="\"$(shell (cd $(top_srcdir)/kdoctools && pwd))\"" 
 
 noinst_LTLIBRARIES = libkbzipfilter_dummy.la

--- kdelibs/kdoctools/xslt.cpp  #1.60:1.61
@@ -27,6 +27,4 @@
 #include <klibloader.h>
 
-#include <iostream>
-
 #if !defined( SIMPLE_XSLT )
 extern HelpProtocol *slave;
@@ -283,6 +281,4 @@ void fillInstance(KInstance &ins) {
     }
 
-        cerr << catalogs.latin1() << endl;
-
     xmlLoadCatalogs(catalogs.latin1());
 }
@@ -390,5 +386,5 @@ bool compareTimeStamps( const QString &o
     if ( !_newer.exists() )
         return false;
-    return ( _newer.lastModified() >= _older.lastModified() );
+    return ( _newer.lastModified() > _older.lastModified() );
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]