X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2FMakefile.in;h=b56e7c658c012ad10bbd54df6efdad78c89ade7b;hb=de041722414a2e31c1c04caa10aaec9d6952e9b4;hp=6f78544af2f59cf87da07cc14e11d324ec3b95b1;hpb=14627f4038ada5d11456f3770090f3c39740d70f;p=xscreensaver

diff --git a/driver/Makefile.in b/driver/Makefile.in
index 6f78544a..b56e7c65 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -148,7 +148,8 @@ SAVER_LIBS	= $(LIBS) $(X_LIBS) @SAVER_LIBS@ $(GL_LIBS) \
 CMD_LIBS	= $(LIBS) $(X_LIBS) \
 		  $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
 
-EXES		= xscreensaver xscreensaver-command xscreensaver-demo
+EXES		= xscreensaver xscreensaver-command xscreensaver-demo \
+		  screensaver-properties-capplet
 EXES2		= @ALL_DEMO_PROGRAMS@
 
 HDRS		= XScreenSaver_ad.h xscreensaver.h prefs.h remote.h \
@@ -159,7 +160,9 @@ ALL_MEN		= xscreensaver.man \
 		  xscreensaver-demo.man xscreensaver-command.man
 EXTRAS		= README Makefile.in XScreenSaver.ad.in xscreensaver.pam \
 		  xscreensaver.kss xscreensaver-demo.glade \
-		  screensaver-properties.desktop.in .gdbinit
+		  screensaver-properties.desktop.in \
+		  screensaver-properties-capplet \
+		  .gdbinit
 VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
 		  vms-getpwnam.c vms-pwd.h vms-hpwd.c vms-validate.c \
 		  vms_axp.opt vms_axp_12.opt vms_decc.opt vms_decc_12.opt
@@ -348,15 +351,28 @@ install-pam:
 install-gnome: screensaver-properties.desktop
 	@lost1=""							     ;\
          lost2=""                                                            ;\
-         if [ "$(install_prefix)$(GNOME_DATADIR)" != "" ]; then               \
+         if [ "$(GNOME_DATADIR)" != "" ]; then                                \
+	                                                                      \
+           if [ ! -d "$(install_prefix)$(GNOME_CCDIR)" ]; then                \
+             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)"          ;\
+                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)"          ;\
+           fi                                                                ;\
+	                                                                      \
            echo    $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
              $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop  ;\
+	                                                                      \
            if      $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
              $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop  ;\
              then true                                                       ;\
            else                                                               \
              lost1="$(install_prefix)$(GNOME_CCDIR)"                         ;\
            fi                                                                ;\
+	                                                                      \
+           if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then             \
+             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)"       ;\
+                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)"       ;\
+           fi                                                                ;\
+	                                                                      \
            echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
                         $(GNOME_PANELDIR)/screensaver-properties.desktop     ;\
            if   $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
@@ -365,6 +381,7 @@ install-gnome: screensaver-properties.desktop
            else                                                               \
              lost2="$(install_prefix)$(GNOME_PANELDIR)"                      ;\
            fi                                                                ;\
+	                                                                      \
            if [ "$$lost1" != "" -o "$$lost2" != "" ]; then                    \
              e=echo ;                                                         \
  $$e ""                                                                      ;\