"Fossies" - the Fresh Open Source Software Archive 
Member "pacpl-code/patches/0001-Fix-installation-under-different-prefix-and-or-DESTD.patch" (22 Aug 2019, 2821 Bytes) of package /linux/privat/pacpl-6.1.3.tar.bz2:
As a special service "Fossies" has tried to format the requested source page into HTML format using (guessed) Diff source code syntax highlighting (style:
standard) with prefixed line numbers.
Alternatively you can here
view or
download the uninterpreted source code file.
1 From 3f7aa5a851ef842d1d38d0f37db7dc21e60df3b8 Mon Sep 17 00:00:00 2001
2 From: Reuben Thomas <rrt@sc3d.org>
3 Date: Mon, 22 Jan 2018 13:11:43 +0000
4 Subject: [PATCH 1/2] Fix installation under different --prefix and/or DESTDIR
5
6 Use DESTDIR consistently.
7
8 Use sysconfdir and pkgdatadir to track user-configured prefix.
9
10 Remove unnecessary re-definitions of automake variables from
11 Makefile.am.
12 ---
13 Makefile.am | 21 ++++-----------------
14 Makefile.in | 11 ++++-------
15 2 files changed, 8 insertions(+), 24 deletions(-)
16
17 diff --git a/Makefile.am b/Makefile.am
18 index f52a21e..d3506f1 100644
19 --- a/Makefile.am
20 +++ b/Makefile.am
21 @@ -65,23 +65,10 @@ RM = @RM@ -f
22 SHELL = /bin/sh
23
24 #
25 -# Configured directories...
26 -#
27 -
28 -prefix = @prefix@
29 -exec_prefix = @exec_prefix@
30 -bindir = @bindir@
31 -datarootdir = @datarootdir@
32 -includedir = @includedir@
33 -libdir = @libdir@
34 -mandir = @mandir@
35 -docdir = @docdir@
36 -
37 -#
38 # Configuration files directories and other
39 #
40 -CONF_DIR = $(DESTDIR)/etc/$(PACKAGE_NAME)
41 -PO_DIR = $(DESTDIR)/usr/share/pacpl/locale
42 +CONF_DIR = $(DESTDIR)$(sysconfdir)/$(PACKAGE_NAME)
43 +PO_DIR = $(DESTDIR)$(pkgdatadir)/locale
44 MOD_DIR = $(CONF_DIR)/modules
45 DOC_DIR = $(DESTDIR)$(docdir)
46 MAN_DIR = $(DESTDIR)$(mandir)/man1
47 @@ -157,7 +144,7 @@ uninstall: uninstall-plugins
48 $(RM) $(MAN_DIR)/pacpl.1.gz
49 $(RM) -r $(CONF_DIR)
50 $(RM) -r $(DOC_DIR)
51 - $(RM) -r $(DESTDIR)/usr/share/pacpl
52 + $(RM) -r $(DESTDIR)$(pkgdatadir)
53
54 uninstall-plugins:
55 if INSTALL_KDE
56 @@ -173,4 +160,4 @@ if INSTALL_NEMO
57 $(RM) $(NEMO_INSTALL_DIR)/PACPL-Convert
58 $(RM) $(NEMO_INSTALL_DIR)/pacpl.nemo_action
59 $(RM) $(ICON_DIR)/pacpl.png
60 -endif
61 \ No newline at end of file
62 +endif
63 diff --git a/Makefile.in b/Makefile.in
64 index 04dbeb4..ff102dc 100644
65 --- a/Makefile.in
66 +++ b/Makefile.in
67 @@ -269,13 +269,10 @@ mandir = @mandir@
68 mkdir_p = @mkdir_p@
69 oldincludedir = @oldincludedir@
70 pdfdir = @pdfdir@
71 -
72 -#
73 -# Configured directories...
74 -#
75 prefix = @prefix@
76 program_transform_name = @program_transform_name@
77 psdir = @psdir@
78 +runstatedir = @runstatedir@
79 sbindir = @sbindir@
80 sharedstatedir = @sharedstatedir@
81 srcdir = @srcdir@
82 @@ -311,8 +308,8 @@ ICON_DIR = $(DESTDIR)$(GNOMEDIR)/share/icons
83 #
84 # Configuration files directories and other
85 #
86 -CONF_DIR = $(DESTDIR)/etc/$(PACKAGE_NAME)
87 -PO_DIR = $(DESTDIR)/usr/share/pacpl/locale
88 +CONF_DIR = $(DESTDIR)$(sysconfdir)/$(PACKAGE_NAME)
89 +PO_DIR = $(DESTDIR)$(pkgdatadir)/locale
90 MOD_DIR = $(CONF_DIR)/modules
91 DOC_DIR = $(DESTDIR)$(docdir)
92 MAN_DIR = $(DESTDIR)$(mandir)/man1
93 @@ -698,7 +695,7 @@ uninstall: uninstall-plugins
94 $(RM) $(MAN_DIR)/pacpl.1.gz
95 $(RM) -r $(CONF_DIR)
96 $(RM) -r $(DOC_DIR)
97 - $(RM) -r $(DESTDIR)/usr/share/pacpl
98 + $(RM) -r $(DESTDIR)$(pkgdatadir)
99
100 uninstall-plugins:
101 @INSTALL_KDE_TRUE@ $(RM) $(KDE_INSTALL_DIR)/pacpl.desktop
102 --
103 2.7.4
104