From 9f5591c33adf0b8e02ffe6da18f2611d9c1e85bc Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Wed, 9 Apr 2003 12:48:29 +0000 Subject: [PATCH] Adjusting datadir for use with unsermake. PS: Did you know that kdebase has 408 Makefile.am's? svn path=/trunk/kdebase/kcontrol/; revision=219288 The following changes were in SVN, but were removed from git: M wallpapers/Makefile.am --- Makefile.am | 4 ++-- kcmkwin/kwinoptions/Makefile.am | 8 ++++---- pics/Makefile.am | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7217a68b63..37173ee63e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,9 +28,9 @@ METASOURCES = AUTO messages: $(XGETTEXT) -kaliasLocal *.h *.cpp -o $(podir)/kwin.pot -datadir = $(kde_datadir)/kwin +kwin_datadir = $(kde_datadir)/kwin -data_DATA= eventsrc +kwin_data_DATA= eventsrc sounddir= $(kde_sounddir) sound_DATA = pop.wav diff --git a/kcmkwin/kwinoptions/Makefile.am b/kcmkwin/kwinoptions/Makefile.am index 45572590d9..395fa83b7c 100644 --- a/kcmkwin/kwinoptions/Makefile.am +++ b/kcmkwin/kwinoptions/Makefile.am @@ -15,9 +15,9 @@ noinst_HEADERS = windows.h mouse.h messages: $(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot -data_DATA = kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop -datadir = $(kde_appsdir)/.hidden +kwin_kcmkwin_options_data_DATA = kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop +kwin_kcmkwin_options_datadir = $(kde_appsdir)/.hidden -data2_DATA = kwinoptions.desktop -data2dir = $(kde_appsdir)/Settings/Desktop +kwin_kcmkwin_options_data2_DATA = kwinoptions.desktop +kwin_kcmkwin_options_data2dir = $(kde_appsdir)/Settings/Desktop diff --git a/pics/Makefile.am b/pics/Makefile.am index 89648f8269..f5a4342bbf 100644 --- a/pics/Makefile.am +++ b/pics/Makefile.am @@ -1,10 +1,10 @@ -data_DATA = close.png maximize.png maximizedown.png menu.png \ +kwin_pics_data_DATA = close.png maximize.png maximizedown.png menu.png \ iconify.png pindown.png pinup.png unknown.png fog.png \ fog-grey.png bluesun.png greenie.light.png greenie.dim.png \ greenie.light.png greenie.dim.png -datadir = $(kde_datadir)/kwin/pics +kwin_pics_datadir = $(kde_datadir)/kwin/pics -EXTRA_DIST = $(data_DATA) +EXTRA_DIST = $(kwin_pics_data_DATA)