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

diff --git a/driver/Makefile.in b/driver/Makefile.in
index 3c2dbced..6f78544a 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -210,8 +210,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 +290,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 ""									     ;\
@@ -618,6 +640,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