diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-06-02 12:39:14 +0200 |
|---|---|---|
| committer | Romain Bouvier <skunnyk@alteroot.org> | 2020-06-04 19:54:45 +0200 |
| commit | 0628ba009c530cb0a0d1440ea4ebb551a6425103 (patch) | |
| tree | e3cc0dbf3bb25cec48c6aeeb7c100fc2dd78d4fe /scripts | |
| parent | caed69490485466132348afe283a2e80ab371ed1 (diff) | |
| download | xfce4-dev-tools-0628ba009c530cb0a0d1440ea4ebb551a6425103.tar.gz | |
Let configure generate the xdt-autogen script
No need to add the rule to Makefile.am when configure itself can
generate the file.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 10 | ||||
| -rw-r--r-- | scripts/xdt-autogen.in (renamed from scripts/xdt-autogen.in.in) | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 6e8130f..49b8044 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -7,17 +7,7 @@ bin_SCRIPTS = \ xdt-autogen -xdt-autogen: Makefile xdt-autogen.in - rm -f xdt-autogen xdt-autogen.gen - sed -e 's,\@DATADIR\@,$(datadir),g' \ - xdt-autogen.in \ - > xdt-autogen.gen - mv xdt-autogen.gen xdt-autogen - CLEANFILES = \ xdt-autogen -DISTCLEANFILES = \ - xdt-autogen.in - # vi:set ts=8 sw=8 noet ai: diff --git a/scripts/xdt-autogen.in.in b/scripts/xdt-autogen.in index 7bcd60c..6cd3d4f 100644 --- a/scripts/xdt-autogen.in.in +++ b/scripts/xdt-autogen.in @@ -29,6 +29,8 @@ XDT_AUTOGEN_VERSION_MINOR="@VERSION_MINOR@" XDT_AUTOGEN_VERSION_MICRO="@VERSION_MICRO@" XDT_AUTOGEN_VERSION_REVISION="@VERSION_REVISION@" +prefix="@prefix@" +datarootdir="@prefix@" ## ## a few portability tests @@ -167,7 +169,7 @@ fi ## test -z "${XDG_DATA_HOME}" && XDG_DATA_HOME="${HOME}/.local/share" test -z "${XDG_DATA_DIRS}" && XDG_DATA_DIRS="/usr/local/share:/usr/share" -test -d "@DATADIR@" && XDG_DATA_DIRS="@DATADIR@:${XDG_DATA_DIRS}" +test -d "@datadir@" && XDG_DATA_DIRS="@datadir@:${XDG_DATA_DIRS}" XDG_DATA_DIRS="${XDG_DATA_HOME}:${XDG_DATA_DIRS}" export XDG_DATA_DIRS XDG_DATA_HOME |