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

diff --git a/driver/Makefile.in b/driver/Makefile.in
index 3c2dbced..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
@@ -210,8 +213,12 @@ install-program: $(EXES)
 	fi ;								      \
 	echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ;    \
 	$$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver
+	@echo $(INSTALL_PROGRAM) xscreensaver-command \
+	  $(install_prefix)$(bindir)/xscreensaver-command ; \
 	$(INSTALL_PROGRAM) xscreensaver-command \
 	  $(install_prefix)$(bindir)/xscreensaver-command
+	@echo $(INSTALL_PROGRAM) xscreensaver-demo \
+	  $(install_prefix)$(bindir)/xscreensaver-demo ; \
 	$(INSTALL_PROGRAM) xscreensaver-demo \
 	  $(install_prefix)$(bindir)/xscreensaver-demo
 
@@ -286,8 +293,26 @@ install-pam:
 	conf="$(PAM_CONF)" ;						\
 									\
 	if [ -d $$dir ] ; then						\
-	  echo $(INSTALL_DATA) $$src $$dir/$$dest ;			\
-	  $(INSTALL_DATA) $$src $$dir/$$dest ;				\
+									\
+	  if [ -f $$dir/xdm ]; then					\
+	    src2=$$dir/xdm ;						\
+	  elif [ -f $$dir/login ]; then					\
+	    src2=$$dir/login ;						\
+	  fi ;								\
+									\
+	  if [ -z "$$src2" ]; then					\
+	    echo $(INSTALL_DATA) $$src $$dir/$$dest ;			\
+	    $(INSTALL_DATA) $$src $$dir/$$dest ;			\
+	  else								\
+	    src="xscreensaver.pam.$$$$" ;				\
+	    echo "grep '^#%\|^auth' $$src2 > $$src" ;			\
+	          grep '^#%\|^auth' $$src2 > $$src ;			\
+	    echo $(INSTALL_DATA) $$src $$dir/$$dest ;			\
+	         $(INSTALL_DATA) $$src $$dir/$$dest ;			\
+	    echo rm -f $$src ;						\
+	         rm -f $$src ;						\
+	  fi ;								\
+									\
 	  if [ ! -f $$dir/$$dest ]; then				\
 	    e=echo ;							\
  $$e ""									     ;\
@@ -326,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      \
@@ -343,6 +381,7 @@ install-gnome: screensaver-properties.desktop
            else                                                               \
              lost2="$(install_prefix)$(GNOME_PANELDIR)"                      ;\
            fi                                                                ;\
+	                                                                      \
            if [ "$$lost1" != "" -o "$$lost2" != "" ]; then                    \
              e=echo ;                                                         \
  $$e ""                                                                      ;\
@@ -618,6 +657,7 @@ subprocs.o: ../config.h
 subprocs.o: $(srcdir)/xscreensaver.h
 subprocs.o: $(srcdir)/prefs.h
 subprocs.o: $(UTILS_SRC)/yarandom.h
+subprocs.o: $(UTILS_SRC)/visual.h
 xset.o: ../config.h
 xset.o: $(srcdir)/xscreensaver.h
 xset.o: $(srcdir)/prefs.h