Attachment 14763 Details for Bug 14512 – bus/Makefile.am cleanup patch

[patch] bus/Makefile.am cleanup patch

0001-Cleanup-automake.patch (text/plain), 1.62 KB, created by Luca Barbato on 2008-03-02 05:48:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luca Barbato

Created: 2008-03-02 05:48:10 UTC

Size: 1.62 KB

patch

obsolete

>diff --git a/bus/Makefile.am b/bus/Makefile.am
>index 3b4f69d..fee18b7 100644
>--- a/bus/Makefile.am
>+++ b/bus/Makefile.am
>@@ -147,9 +147,13 @@ else
> TESTS=
> endif
> 
>-## we use noinst_PROGRAMS not check_PROGRAMS so that we build 
>-## even when not doing "make check"
>-noinst_PROGRAMS=$(TESTS) dbus-daemon dbus-daemon-launch-helper-test dbus-daemon-launch-helper
>+check_PROGRAMS=$(TESTS) dbus-daemon-launch-helper-test
>+
>+dbus_daemondir=$(DBUS_DAEMONDIR)
>+
>+dbus_daemon_PROGRAMS=dbus-daemon
>+
>+libexec_PROGRAMS=dbus-daemon-launch-helper
> 
> bus_test_system_SOURCES=			\
> 	$(XML_SOURCES)				\
>@@ -175,23 +179,15 @@ bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
> clean-local:
> 	/bin/rm *.bb *.bbg *.da *.gcov || true
> 
>-uninstall-hook:
>-	rm -f $(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon
>-	rm -f $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper
>-
> install-data-hook:
>-	if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \
>-		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
>-		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
>-	fi
>-	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
> 	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
> 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
> 	$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
> 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
> 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
> 	$(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
>-	$(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
>+
>+install-exec-hook:
> 	if test `id -u` -eq 0; then \
> 		chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
> 		chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \

Actions: View | Splinter Review

Attachments on bug 14512: 14763 | 43758 | 44710

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.