This commit is contained in:
espie 2000-04-05 23:25:19 +00:00
parent 7d7b23761a
commit 579ab2a542
4 changed files with 51 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2000/03/26 22:21:18 brad Exp $
# $OpenBSD: Makefile,v 1.11 2000/04/05 23:25:19 espie Exp $
# Original Author: Yanick Cote <yanick@fries.net>
DISTNAME= kdelibs-1.1.2
@ -25,6 +25,7 @@ PERMIT_DISTFILES_FTP= Yes
USE_BZIP2= Yes
USE_GMAKE= Yes
GNU_CONFIGURE= Yes
FAKE= Yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static \
--with-qt-includes="${LOCALBASE}/include/X11/qt" \

View File

@ -1,6 +1,6 @@
--- kdecore/Makefile.in.orig Tue Mar 7 18:18:17 2000
+++ kdecore/Makefile.in Tue Mar 7 18:18:33 2000
@@ -189,7 +189,7 @@
--- kdecore/Makefile.in.orig Tue Sep 7 17:23:13 1999
+++ kdecore/Makefile.in Wed Apr 5 16:07:03 2000
@@ -189,7 +189,7 @@ noinst_HEADERS = kdebugdialog.h kcharset
libkdecore_la_SOURCES = kconfig.cpp kconfigbase.cpp ksimpleconfig.cpp kcolorgroup.cpp kapp.cpp kurl.cpp ksock.cpp drag.cpp kprocess.cpp kprocctrl.cpp klocale.cpp libintl.cpp fakes.cpp kiconloader.cpp kdebug.cpp kstdaccel.cpp kwm.cpp krootprop.cpp kcharsets.cpp kcharsetsdata.cpp kchartables.cpp kstring.cpp kpixmap.cpp dither.cpp kckey.cpp kaccel.cpp kglobalaccel.cpp kclipboard.cpp krect.cpp ksize.cpp kpoint.cpp
@ -9,3 +9,14 @@
# libkdecore_la_LIBADD =
libkdecore_la_METASOURCES = drag.moc kapp.moc kclipboard.moc kconfig.moc kconfigbase.moc kdebugdialog.moc kglobalaccel.moc kiconloader.moc kprocctrl.moc kprocess.moc ksimpleconfig.moc ksock.moc
@@ -489,8 +489,8 @@ ckey.h : convert_key.c
rm -f ackey ckey
install-data-local: charsets.config
- $(mkinstalldirs) $(kde_confdir)
- $(INSTALL_DATA) $(srcdir)/charsets.config $(kde_confdir)/charsets
+ $(mkinstalldirs) $(DESTDIR)$(kde_confdir)
+ $(INSTALL_DATA) $(srcdir)/charsets.config $(DESTDIR)$(kde_confdir)/charsets
uninstall-local:
-rm -f $(kde_confdir)/charsets

View File

@ -0,0 +1,15 @@
--- doc/Makefile.in.orig Wed Apr 5 16:12:56 2000
+++ doc/Makefile.in Wed Apr 5 16:14:00 2000
@@ -390,9 +390,9 @@ maintainer-clean-generic clean mostlycle
install-data-local:
- $(mkinstalldirs) $(kde_htmldir)
- -rm -f $(kde_htmldir)/default
- $(LN_S) en $(kde_htmldir)/default
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)
+ -rm -f $(DESTDIR)$(kde_htmldir)/default
+ $(LN_S) en $(DESTDIR)$(kde_htmldir)/default
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

View File

@ -0,0 +1,20 @@
--- po/Makefile.in.orig Wed Apr 5 16:18:37 2000
+++ po/Makefile.in Wed Apr 5 16:19:44 2000
@@ -343,7 +343,7 @@ all-no:
install-yes: all
@catalogs='$(GMOFILES)'; \
for cat in $$catalogs; do \
- destdir=$(localedir); \
+ destdir=$(DESTDIR)$(localedir); \
lang=`echo $$cat | sed 's/\.gmo//'`; \
name=kde.mo \
dir=$$destdir/$$lang/LC_MESSAGES; \
@@ -353,7 +353,7 @@ install-yes: all
done;\
charsets='$(CHARSETFILES)'; \
for chset in $$charsets; do \
- destdir=$(localedir); \
+ destdir=$(DESTDIR)$(localedir); \
lang=`echo $$chset | sed 's/\.charset//'`; \
name=charset ; \
dir=$$destdir/$$lang; \