From 9978760d7f9e214ba0cad988a35f5b2499ca67cf Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 26 Apr 2020 16:35:09 +0100
Subject: [PATCH] Fix various path issues

---
 .gitignore                          |  1 +
 Makefile.in                         | 26 ++++++++------------------
 iconinfo.pl                         |  2 +-
 system.amiwmrc => system.amiwmrc.in |  2 +-
 4 files changed, 11 insertions(+), 20 deletions(-)
 rename system.amiwmrc => system.amiwmrc.in (87%)

diff --git a/.gitignore b/.gitignore
index b09ed54..33c55b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ Makefile
 /lex.c
 /ppmtoinfo
 /requestchoice
+/system.amiwmrc
diff --git a/Makefile.in b/Makefile.in
index 961021a..b00ed8f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,9 +12,9 @@ LIBS = @X_LIBS@ @X_PRE_LIBS@ -Llibami -lami @XT_LIB_KLUDGE@ -lXext -lXmu \
 	-lX11 @X_EXTRA_LIBS@ @LIBS@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
-mandir = $(prefix)/man
+bindir = @bindir@
+libdir = @libdir@
+mandir = @mandir@
 INSTALL = @INSTALL@
 LN_S = @LN_S@
 RM = -rm -f
@@ -39,7 +39,7 @@ SRCS = main.c screen.c client.c frame.c icc.c \
 
 DISTFILES = README.md MODULES.md INSTALL LICENSE amiwm.1 \
 	configure configure.ac Makefile.in install-sh smakefile scoptions \
-	*.[chly] system.amiwmrc def_*.info *.map \
+	*.[chly] system.amiwmrc.in def_*.info *.map \
 	Background Background_resize Background_resize_norepeat \
 	Background_stretch Launcher Xresources.amiwm.in Amilogo.?m \
 	Xsession*.in Xinitrc.in amiwm-init libami/Makefile.in libami/*.[chly] \
@@ -94,7 +94,7 @@ kbdmodule.h kbdmodule.c: kbdmodule.y
 kbdlexer.c: kbdlexer.l
 	$(LEX) -t $< > kbdlexer.c
 
-install: $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init
+install: $(PROGS) $(MODULES) system.amiwmrc Xsession Xsession2 Xinitrc amiwm-init
 	-mkdir -p $(DESTDIR)$(AMIWM_HOME)
 	-mkdir -p $(DESTDIR)$(AMIWM_MODULES)
 	$(INSTALL) $(STRIPFLAG) requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice
@@ -119,7 +119,7 @@ install: $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init
 	    fi; \
 	  fi; \
 	done
-	$(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc
+	$(INSTALL) -m 644 system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc
 	$(INSTALL) -m 644 $(srcdir)/def_disk.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info
 	$(INSTALL) -m 644 $(srcdir)/def_drawer.info $(DESTDIR)$(AMIWM_HOME)/def_drawer.info
 	$(INSTALL) -m 644 $(srcdir)/def_project.info $(DESTDIR)$(AMIWM_HOME)/def_project.info
@@ -225,18 +225,8 @@ Makefile: $(srcdir)/Makefile.in config.status
 libami/Makefile: $(srcdir)/libami/Makefile.in config.status
 	./config.status
 
-Xresources.amiwm: $(srcdir)/Xresources.amiwm.in
-	sed -e 's:[@]bindir[@]:$(bindir):g' -e 's:[@]AMIWM_HOME[@]:$(AMIWM_HOME):g' < $(srcdir)/Xresources.amiwm.in > Xresources.amiwm
-
-Xsession: $(srcdir)/Xsession.in config.status
-	sed -e 's:[@]bindir[@]:$(bindir):g' -e 's:[@]AMIWM_HOME[@]:$(AMIWM_HOME):g' < $(srcdir)/Xsession.in > Xsession
-
-Xsession2: $(srcdir)/Xsession2.in config.status
-	sed -e 's:[@]bindir[@]:$(bindir):g' -e 's:[@]AMIWM_HOME[@]:$(AMIWM_HOME):g' < $(srcdir)/Xsession2.in > Xsession2
-
-Xinitrc: $(srcdir)/Xinitrc.in config.status
-	sed -e 's:[@]bindir[@]:$(bindir):g' -e 's:[@]AMIWM_HOME[@]:$(AMIWM_HOME):g' < $(srcdir)/Xinitrc.in > Xinitrc
-
+system.amiwmrc Xresources.amiwm Xsession Xsession2 Xinitrc: %: $(srcdir)/%.in config.status
+	sed -e 's:[@]bindir[@]:$(bindir):g' -e 's:[@]AMIWM_HOME[@]:$(AMIWM_HOME):g' < "$<" > "$@"
 
 depend:: $(SRCS)
 	-@rm Makefile.bak
diff --git a/iconinfo.pl b/iconinfo.pl
index 6038c9d..754f9ed 100755
--- a/iconinfo.pl
+++ b/iconinfo.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 
 sub chompstring {
     my ($len, $rest)=unpack("Na*", $_[0]);
diff --git a/system.amiwmrc b/system.amiwmrc.in
similarity index 87%
rename from system.amiwmrc
rename to system.amiwmrc.in
index 4ab9581..8208564 100644
--- a/system.amiwmrc
+++ b/system.amiwmrc.in
@@ -1,7 +1,7 @@
 FastQuit Off
 SizeBorder Right
 IconPalette MagicWB
-IconDir "/usr/local/lib/amiwm/"
+IconDir "@AMIWM_HOME@/"
 DefaultIcon "def_tool.info"
 CustomIconsOnly Off
 ShortLabelIcons Off