Merge changes from CUPS 1.4svn-r7932.

[thirdparty/cups.git] / notifier / Makefile

diff --git a/notifier/Makefile b/notifier/Makefile
index 2c80380a6906d47060bd14119c6bd83ba63b5553..1f63c8497a2fef15b353bc4a5d5ad0d310a56a79 100644 (file)
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -64,10 +64,6 @@ install:     all install-data install-headers install-libs install-exec
 install-data:
        $(INSTALL_DIR) -m 775 $(CACHEDIR)/rss
        -chgrp $(CUPS_GROUP) $(CACHEDIR)/rss
-       if test "x$(SYMROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SYMROOT); \
-               cp $(NOTIFIERS) $(SYMROOT); \
-       fi
 
 
 #
@@ -80,6 +76,10 @@ install-exec:
        for file in $(NOTIFIERS); do \
                $(INSTALL_BIN) $$file $(SERVERBIN)/notifier; \
        done
+       if test "x$(SYMROOT)" != "x"; then \
+               $(INSTALL_DIR) $(SYMROOT); \
+               cp $(NOTIFIERS) $(SYMROOT); \
+       fi
 
 
 #
@@ -125,10 +125,6 @@ dbus:      dbus.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LIBS)
 
-dbus.o:        dbus.h
-dbus.h:        dbus-notifier.xml
-       dbus-binding-tool --mode=glib-server $< >$@
-
 
 #
 # mailto