diff options
| author | Fritz Elfert <felfert@to.com> | 2002-07-10 23:15:43 +0000 |
|---|---|---|
| committer | Fritz Elfert <felfert@to.com> | 2002-07-10 23:15:43 +0000 |
| commit | bb20db8e8760000402af72583770a4683ef79693 (patch) | |
| tree | d01aa7fbdb573b4157ef98e9d61ec662c6d6e4dc /kde2 | |
| parent | 55769bf5193338be8850198659ff066b09c7c695 (diff) | |
| download | plptools-bb20db8e8760000402af72583770a4683ef79693.tar.gz plptools-bb20db8e8760000402af72583770a4683ef79693.tar.bz2 plptools-bb20db8e8760000402af72583770a4683ef79693.zip | |
- SuSE 8 - related changes
- RPM - related changes
- sisinstall: Correct shutdown of newt if an error occurs.
Diffstat (limited to 'kde2')
| -rw-r--r-- | kde2/doc/de/Makefile.am | 2 | ||||
| -rw-r--r-- | kde2/kioslave/Makefile.am | 2 | ||||
| -rw-r--r-- | kde2/klipsi/Makefile.am | 2 | ||||
| -rw-r--r-- | kde2/klipsi/klipsi.desktop | 1 | ||||
| -rw-r--r-- | kde2/kpsion/Makefile.am | 2 | ||||
| -rw-r--r-- | kde2/plugins/Makefile.am | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/kde2/doc/de/Makefile.am b/kde2/doc/de/Makefile.am index 96e877a..c426ca4 100644 --- a/kde2/doc/de/Makefile.am +++ b/kde2/doc/de/Makefile.am @@ -4,5 +4,5 @@ KDE_DOCS = kpsion EXTRA_DIST = index.docbook.in -index.docbook: index.docbook.in +index.docbook: cat index.docbook.in | perl -e 'while (<>) { if (/\$$Date:\s+(.*)\s+\$$/) { $$d=$$1; } s/__DATE__/$$d/; s/__VERSION__/$(VERSION)/; print; }' > index.docbook diff --git a/kde2/kioslave/Makefile.am b/kde2/kioslave/Makefile.am index 1005c90..f0efa3a 100644 --- a/kde2/kioslave/Makefile.am +++ b/kde2/kioslave/Makefile.am @@ -13,7 +13,7 @@ kio_plp_la_LDFLAGS = -module -avoid-version lib_LTLIBRARIES = kio_plp.la kio_plp_la_SOURCES = kio_plp.cpp -kio_plp_la_LIBADD = -L$(top_srcdir)/lib -lplp $(LIB_KIO) +kio_plp_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la $(LIB_KIO) noinst_HEADERS = kio_plp.h diff --git a/kde2/klipsi/Makefile.am b/kde2/klipsi/Makefile.am index 0a26739..1b5ac7b 100644 --- a/kde2/klipsi/Makefile.am +++ b/kde2/klipsi/Makefile.am @@ -18,7 +18,7 @@ lib_LTLIBRARIES = klipsi.la CLEANFILES = dummy.cpp -klipsi_la_LIBADD = -L$(top_srcdir)/lib -lplp $(LIB_KDEUI) +klipsi_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la $(LIB_KDEUI) klipsi_la_SOURCES = main.cpp toplevel.cpp klipsi_la_LDFLAGS = $(all_libraries) -module -avoid-version diff --git a/kde2/klipsi/klipsi.desktop b/kde2/klipsi/klipsi.desktop index dd942c7..38a1153 100644 --- a/kde2/klipsi/klipsi.desktop +++ b/kde2/klipsi/klipsi.desktop @@ -6,4 +6,3 @@ Icon=klipsi Type=Application DocPath=klipsi/index.html Terminal=0 -X-KDE-autostart-after=panel diff --git a/kde2/kpsion/Makefile.am b/kde2/kpsion/Makefile.am index d1a7997..693334c 100644 --- a/kde2/kpsion/Makefile.am +++ b/kde2/kpsion/Makefile.am @@ -23,7 +23,7 @@ libkpsion_la_SOURCES = kpsion.cpp setupdialog.cpp wizards.cpp \ statusbarprogress.cpp kpsionconfig.cpp kpsionbackuplistview.cpp \ kpsionrestoredialog.cpp -libkpsion_la_LIBADD = $(top_srcdir)/lib/libplp.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) +libkpsion_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) kpsion_SOURCES = main.cpp kpsion_LDFLAGS = $(KDE_RPATH) diff --git a/kde2/plugins/Makefile.am b/kde2/plugins/Makefile.am index e53176c..f8e20f7 100644 --- a/kde2/plugins/Makefile.am +++ b/kde2/plugins/Makefile.am @@ -12,7 +12,7 @@ lib_LTLIBRARIES = libplpprops.la libplpprops_la_SOURCES = plpprops.cc plppropsFactory.cc pie3dpiece.cpp \ pie3dwidget.cpp -libplpprops_la_LIBADD = -L$(top_srcdir)/lib -lplp $(LIB_KIO) $(LIB_KFILE) +libplpprops_la_LIBADD = -L$(top_srcdir)/lib/.libs $(top_srcdir)/lib/libplp.la $(LIB_KIO) $(LIB_KFILE) noinst_HEADERS = plpprops.h plppropsFactory.h pie3dpiece.h pie3dwidget.h services_DATA = plpprops.desktop |