[systemd-devel] libsytemd is missing move-to-rootlibdir when using split-ur

[Michael Biebl]

2014-02-20 17:24 GMT+01:00 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>:
> On Thu, Feb 20, 2014 at 05:20:05PM +0100, Michael Biebl wrote:
>> With split-usr, libsystemd should be installed to /lib, not /usr/lib.
>>
>> The compat-libs are still correctly installed to /lib, but
>> libsystemd.so itself isn't
>>
>> Will follow up with a patch unless someone beats me to it
>
> e288d6a81a77?

Ah, perfect. Was looking at 209...

Btw, could we split this up like this, makes more sense to me this way:

diff --git a/Makefile.am b/Makefile.am
index 08b94d7..f9df547 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2049,11 +2049,6 @@ libsystemd_la_LIBADD = \

 libsystemd-install-hook:
        libname=libsystemd.so && $(move-to-rootlibdir)
-       -$(MKDIR_P) $(DESTDIR)/var/log/journal
-       -chown 0:0 $(DESTDIR)/var/log/journal
-       -chmod 755 $(DESTDIR)/var/log/journal
-       -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
-       -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/

 libsystemd-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
@@ -3133,6 +3128,19 @@ endif
 noinst_LTLIBRARIES += \
        libsystemd-journal-core.la

+journal-install-hook:
+       -$(MKDIR_P) $(DESTDIR)/var/log/journal
+       -chown 0:0 $(DESTDIR)/var/log/journal
+       -chmod 755 $(DESTDIR)/var/log/journal
+       -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
+       -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
+
+journal-uninstall-hook:
+       -rmdir $(DESTDIR)/var/log/journal/
+
+INSTALL_EXEC_HOOKS += journal-install-hook
+UNINSTALL_EXEC_HOOKS += journal-uninstall-hook
+
 # ------------------------------------------------------------------------------





-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?