diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-08-09 08:32:04 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2010-08-10 08:25:24 +0200 |
| commit | aec82e2edd6344310958e9b038a4bb17bcbba5b7 (patch) | |
| tree | e37a17fc6b270855193e1f24ca3948ce838b8673 /bus/Makefile.am | |
| parent | 77ee59e06dbb6facda9d4ebdcf47f14adfea091e (diff) | |
| download | dbus-aec82e2edd6344310958e9b038a4bb17bcbba5b7.tar.gz | |
Applied patches from cygwin port.
Diffstat (limited to 'bus/Makefile.am')
| -rw-r--r-- | bus/Makefile.am | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index af1878ea..a5889ff1 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -206,13 +206,13 @@ if DBUS_UNIX $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ fi - $(INSTALL_PROGRAM) dbus-daemon$(EXEEXT) $(DESTDIR)$(DBUS_DAEMONDIR) + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) dbus-daemon$(EXEEXT) $(DESTDIR)$(DBUS_DAEMONDIR) $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1 if test -f dbus-daemon-launch-helper$(EXEEXT) ; then \ - $(INSTALL_PROGRAM) dbus-daemon-launch-helper$(EXEEXT) $(DESTDIR)$(libexecdir); \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) dbus-daemon-launch-helper$(EXEEXT) $(DESTDIR)$(libexecdir); \ 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; \ + chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \ + chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \ else \ echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \ echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \ @@ -227,6 +227,7 @@ endif #### Init scripts fun SCRIPT_IN_FILES=messagebus.in \ + messagebus-config.in \ rc.messagebus.in ## Red Hat start @@ -251,6 +252,15 @@ initd_SCRIPTS= \ endif ## Slackware end +## Cygwin start +if DBUS_INIT_SCRIPTS_CYGWIN + +bin_SCRIPTS= \ + messagebus-config + +endif +## Cygwin end + if HAVE_SYSTEMD SCRIPT_IN_FILES += \ dbus.service.in \ |