From 5076b6f496e86eb8a172c8a478f1f7a1195333f5 Mon Sep 17 00:00:00 2001 From: John D Pell Date: Sun, 8 Aug 2021 10:02:25 +0200 Subject: [PATCH] Default Files: Replace misleading variables 'defsdatadir' in Makefiles The parameter name 'defsdatadir' was copied in to many sub-Makefiles; for all of them give a unique name for clarity. --- WindowMaker/Backgrounds/Makefile.am | 6 +++--- WindowMaker/Defaults/Makefile.am | 2 +- WindowMaker/IconSets/Makefile.am | 4 ++-- WindowMaker/Icons/Makefile.am | 6 +++--- WindowMaker/Pixmaps/Makefile.am | 6 +++--- WindowMaker/Styles/Makefile.am | 6 +++--- WindowMaker/Themes/Makefile.am | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/WindowMaker/Backgrounds/Makefile.am b/WindowMaker/Backgrounds/Makefile.am index 2a10853c..295b0816 100644 --- a/WindowMaker/Backgrounds/Makefile.am +++ b/WindowMaker/Backgrounds/Makefile.am @@ -1,6 +1,6 @@ -defsdatadir = $(pkgdatadir)/Backgrounds +bgdatadir = $(pkgdatadir)/Backgrounds -defsdata_DATA = BlueImage.jpeg +bgdata_DATA = BlueImage.jpeg -EXTRA_DIST = $(defsdata_DATA) +EXTRA_DIST = $(bgdata_DATA) diff --git a/WindowMaker/Defaults/Makefile.am b/WindowMaker/Defaults/Makefile.am index 1556fbf9..be5df3b3 100644 --- a/WindowMaker/Defaults/Makefile.am +++ b/WindowMaker/Defaults/Makefile.am @@ -1,4 +1,4 @@ -defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL +pkgconf_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL wpexecbindir = @wprefs_bindir@ diff --git a/WindowMaker/IconSets/Makefile.am b/WindowMaker/IconSets/Makefile.am index 4185a5d0..e5dcf35a 100644 --- a/WindowMaker/IconSets/Makefile.am +++ b/WindowMaker/IconSets/Makefile.am @@ -1,7 +1,7 @@ -defsdatadir = $(pkgdatadir)/IconSets +iconsetdatadir = $(pkgdatadir)/IconSets -defsdata_DATA = Default.iconset +iconsetdata_DATA = Default.iconset EXTRA_DIST = diff --git a/WindowMaker/Icons/Makefile.am b/WindowMaker/Icons/Makefile.am index a236154b..3a3216b5 100644 --- a/WindowMaker/Icons/Makefile.am +++ b/WindowMaker/Icons/Makefile.am @@ -1,8 +1,8 @@ -defsdatadir = $(pkgdatadir)/Icons +icondatadir = $(pkgdatadir)/Icons -defsdata_DATA = \ +icondata_DATA = \ BitchX.tiff\ BitchX.xpm\ clip.tiff\ @@ -74,5 +74,5 @@ defsdata_DATA = \ xv.xpm -EXTRA_DIST = $(defsdata_DATA) +EXTRA_DIST = $(icondata_DATA) diff --git a/WindowMaker/Pixmaps/Makefile.am b/WindowMaker/Pixmaps/Makefile.am index b3ee504d..d5edb6ca 100644 --- a/WindowMaker/Pixmaps/Makefile.am +++ b/WindowMaker/Pixmaps/Makefile.am @@ -1,10 +1,10 @@ -defsdatadir = $(pkgdatadir)/Pixmaps +pixmapdatadir = $(pkgdatadir)/Pixmaps -defsdata_DATA = tile.tiff \ +pixmapdata_DATA = tile.tiff \ tile.xpm \ swtile.png \ swback.png \ swback2.png -EXTRA_DIST = $(defsdata_DATA) +EXTRA_DIST = $(pixmapdata_DATA) diff --git a/WindowMaker/Styles/Makefile.am b/WindowMaker/Styles/Makefile.am index f39fe0c6..b860d2b9 100644 --- a/WindowMaker/Styles/Makefile.am +++ b/WindowMaker/Styles/Makefile.am @@ -1,7 +1,7 @@ -prefsdatadir = $(pkgdatadir)/Styles +styledatadir = $(pkgdatadir)/Styles -prefsdata_DATA =\ +styledata_DATA =\ Adwaita.style\ Autumn.style\ Black.style\ @@ -39,6 +39,6 @@ prefsdata_DATA =\ Traditional.style\ VioletBlue.style -EXTRA_DIST = $(prefsdata_DATA) +EXTRA_DIST = $(styledata_DATA) diff --git a/WindowMaker/Themes/Makefile.am b/WindowMaker/Themes/Makefile.am index cf0ccd29..3acd72fd 100644 --- a/WindowMaker/Themes/Makefile.am +++ b/WindowMaker/Themes/Makefile.am @@ -1,6 +1,6 @@ -defsdatadir = $(pkgdatadir)/Themes +themesdatadir = $(pkgdatadir)/Themes -defsdata_DATA = Default.style OpenStep.style Pastel.style SteelBlueSilk.style Blau.style +themesdata_DATA = Default.style OpenStep.style Pastel.style SteelBlueSilk.style Blau.style -EXTRA_DIST = $(defsdata_DATA) +EXTRA_DIST = $(themesdata_DATA)