mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 16:27:27 +00:00
Eric Bénard
06ea40eb6d
Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
95 lines
3.6 KiB
Diff
95 lines
3.6 KiB
Diff
Upstream-Status: Undecided
|
|
|
|
This patch removes some of hardcoded references to /lib
|
|
and /usr/lib since on some architectures it should be
|
|
/lib64 and /usr/lib64 atleast in OE
|
|
|
|
I am not sure about the intention of hardcoded values
|
|
thats why status is undecided
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
Index: git/Makefile.am
|
|
===================================================================
|
|
--- git.orig/Makefile.am 2012-07-22 16:20:38.424405916 -0700
|
|
+++ git/Makefile.am 2012-07-22 16:23:21.232406621 -0700
|
|
@@ -61,23 +61,23 @@
|
|
|
|
# Our own, non-special dirs
|
|
pkgsysconfdir=$(sysconfdir)/systemd
|
|
-userunitdir=$(prefix)/lib/systemd/user
|
|
-tmpfilesdir=$(prefix)/lib/tmpfiles.d
|
|
-sysctldir=$(prefix)/lib/sysctl.d
|
|
-usergeneratordir=$(prefix)/lib/systemd/user-generators
|
|
+userunitdir=$(prefix)/$(rootlibdir)/systemd/user
|
|
+tmpfilesdir=$(prefix)/$(rootlibdir)/tmpfiles.d
|
|
+sysctldir=$(prefix)/$(rootlibdir)/sysctl.d
|
|
+usergeneratordir=$(prefix)/$(rootlibdir)/systemd/user-generators
|
|
pkgincludedir=$(includedir)/systemd
|
|
systemgeneratordir=$(rootlibexecdir)/system-generators
|
|
systemshutdowndir=$(rootlibexecdir)/system-shutdown
|
|
systemsleepdir=$(rootlibexecdir)/system-sleep
|
|
-systemunitdir=$(rootprefix)/lib/systemd/system
|
|
-udevlibexecdir=$(rootprefix)/lib/udev
|
|
+systemunitdir=$(rootprefix)/$(rootlibdir)/systemd/system
|
|
+udevlibexecdir=$(rootprefix)/$(rootlibdir)/udev
|
|
udevhomedir = $(udevlibexecdir)
|
|
udevrulesdir = $(udevlibexecdir)/rules.d
|
|
|
|
# And these are the special ones for /
|
|
rootprefix=@rootprefix@
|
|
rootbindir=$(rootprefix)/bin
|
|
-rootlibexecdir=$(rootprefix)/lib/systemd
|
|
+rootlibexecdir=$(rootprefix)/$(rootlibdir)/systemd
|
|
|
|
CLEANFILES =
|
|
EXTRA_DIST =
|
|
@@ -126,7 +126,7 @@
|
|
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
|
|
-DROOTPREFIX=\"$(rootprefix)\" \
|
|
-DRUNTIME_DIR=\"/run\" \
|
|
- -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
|
|
+ -DRANDOM_SEED=\"$(localstatedir)/$(rootlibdir)/random-seed\" \
|
|
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
|
|
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
|
|
-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
|
|
@@ -2535,7 +2535,7 @@
|
|
|
|
binfmt-install-data-hook:
|
|
$(MKDIR_P) -m 0755 \
|
|
- $(DESTDIR)$(prefix)/lib/binfmt.d \
|
|
+ $(DESTDIR)$(prefix)/$(rootlibdir)/binfmt.d \
|
|
$(DESTDIR)$(sysconfdir)/binfmt.d \
|
|
$(DESTDIR)$(systemunitdir)/sysinit.target.wants
|
|
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
|
|
@@ -3165,7 +3165,7 @@
|
|
logind-install-data-hook:
|
|
$(MKDIR_P) -m 0755 \
|
|
$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
|
|
- $(DESTDIR)$(localstatedir)/lib/systemd
|
|
+ $(DESTDIR)$(localstatedir)/$(rootlibdir)/systemd
|
|
( cd $(DESTDIR)$(systemunitdir) && \
|
|
rm -f dbus-org.freedesktop.login1.service && \
|
|
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
|
|
@@ -3284,7 +3284,7 @@
|
|
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
|
|
-e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
|
|
-e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
|
|
- -e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \
|
|
+ -e 's,@RANDOM_SEED\@,$(localstatedir)/$(rootlibdir)/random-seed,g' \
|
|
-e 's,@prefix\@,$(prefix),g' \
|
|
-e 's,@exec_prefix\@,$(exec_prefix),g' \
|
|
-e 's,@libdir\@,$(libdir),g' \
|
|
@@ -3407,9 +3407,9 @@
|
|
$(MKDIR_P) -m 0755 \
|
|
$(DESTDIR)$(tmpfilesdir) \
|
|
$(DESTDIR)$(sysconfdir)/tmpfiles.d \
|
|
- $(DESTDIR)$(prefix)/lib/modules-load.d \
|
|
+ $(DESTDIR)$(prefix)/$(rootlibdir)/modules-load.d \
|
|
$(DESTDIR)$(sysconfdir)/modules-load.d \
|
|
- $(DESTDIR)$(prefix)/lib/sysctl.d \
|
|
+ $(DESTDIR)$(prefix)/$(rootlibdir)/sysctl.d \
|
|
$(DESTDIR)$(sysconfdir)/sysctl.d \
|
|
$(DESTDIR)$(systemshutdowndir) \
|
|
$(DESTDIR)$(systemsleepdir) \
|