projects / xscreensaver / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
http://packetstorm.tacticalflex.com/UNIX/admin/xscreensaver-3.27.tar.gz
[xscreensaver] / driver / Makefile.in
diff --git a/driver/Makefile.in b/driver/Makefile.in
index 393bc2188d919b4d88e3b3c262869339dbe81f9e..b56e7c658c012ad10bbd54df6efdad78c89ade7b 100644 (file)
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -35,6 +35,7 @@ SHELL         = /bin/sh
 INSTALL                = @INSTALL@
 SUID_FLAGS      = -o root -m 4755
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT  = @INSTALL_PROGRAM@
 INSTALL_SETUID  = @INSTALL_SETUID@
 INSTALL_DATA   = @INSTALL_DATA@
 INSTALL_DIRS   = @INSTALL_DIRS@
@@ -147,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 \
@@ -158,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
@@ -209,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
 
@@ -285,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 ""                                                                             ;\
@@ -323,23 +349,69 @@ install-pam:
        fi
 
 install-gnome: screensaver-properties.desktop
-       @if [ "$(GNOME_DATADIR)" != "" ]; then                               \
-          echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
-                          $(GNOME_CCDIR)/screensaver-properties.desktop    ; \
-               $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
-                          $(GNOME_CCDIR)/screensaver-properties.desktop    ; \
-          echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
-                       $(GNOME_PANELDIR)/screensaver-properties.desktop    ; \
-               $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
-                       $(GNOME_PANELDIR)/screensaver-properties.desktop    ; \
-       fi
+       @lost1=""                                                            ;\
+         lost2=""                                                            ;\
+         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      \
+       $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop     ;\
+             then true                                                       ;\
+           else                                                               \
+             lost2="$(install_prefix)$(GNOME_PANELDIR)"                      ;\
+           fi                                                                ;\
+                                                                             \
+           if [ "$$lost1" != "" -o "$$lost2" != "" ]; then                    \
+             e=echo ;                                                         \
+ $$e ""                                                                      ;\
+ $$e "  ####################################################################";\
+ $$e "  Warning: unable to install screensaver-properties.desktop into"      ;\
+                 plurality="this file"                                       ;\
+          if [ "$$lost1" != "" -a "$$lost2" != "" ]; then                     \
+ $$e "           $$lost1/ or into"                                           ;\
+ $$e "           $$lost2/."                                                  ;\
+                 plurality="these files"                                     ;\
+          elif [ "$$lost1" != "" ]; then                                      \
+ $$e "           $$lost1/."                                                  ;\
+          else                                                                \
+ $$e "           $$lost2/."                                                  ;\
+          fi                                                                 ;\
+ $$e "           Without $$plurality," 'the "Screen Saver" section of the'   ;\
+ $$e "           Gnome Control Center (gnomecc) will not work properly."     ;\
+ $$e "  ####################################################################";\
+ $$e ""                                                                      ;\
+             exit 1 ;                                                         \
+           fi                                                                ;\
+         fi
 
 uninstall-gnome:
-       @if [ "$(GNOME_DATADIR)" != "" ]; then                                \
-         echo rm -f $(GNOME_CCDIR)/screensaver-properties.desktop          ; \
-              rm -f $(GNOME_CCDIR)/screensaver-properties.desktop          ; \
-         echo rm -f $(GNOME_PANELDIR)/screensaver-properties.desktop       ; \
-              rm -f $(GNOME_PANELDIR)/screensaver-properties.desktop       ; \
+       @if [ "$(install_prefix)$(GNOME_DATADIR)" != "" ]; then               \
+          f=screensaver-properties.desktop                                   ;\
+          echo rm -f $(install_prefix)$(GNOME_CCDIR)/$$f                     ;\
+               rm -f $(install_prefix)$(GNOME_CCDIR)/$$f                     ;\
+          echo rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f                  ;\
+               rm -f $(install_prefix)$(GNOME_PANELDIR)/$$f                  ;\
         fi
 
 install-kde:
@@ -347,8 +419,8 @@ install-kde:
        if [ "$$KDEDIR" != "" ]; then                                         \
          dir="$(install_prefix)$$KDEDIR/bin" ;                               \
          dest="$$dir/xscreensaver.kss" ;                                     \
-         echo $(INSTALL_PROGRAM) $$src $$dest ;                              \
-         if $(INSTALL_PROGRAM) $$src $$dest ; then                           \
+         echo $(INSTALL_SCRIPT) $$src $$dest ;                               \
+         if $(INSTALL_SCRIPT) $$src $$dest ; then                            \
            true ;                                                            \
          else                                                                \
            e=echo ;                                                          \
@@ -425,7 +497,7 @@ update_ad_version::
        echo -n "Updating version number in $$S to $$V $$D... " ;           \
        T=/tmp/xs.$$$$ ;                                                    \
        sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*\(.*\)/\1$$V\2/"         \
-           -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9]\)/$$D/"           \
+           -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/"     \
          < $$S > $$T ;                                                     \
        if cmp -s $$S $$T ; then                                            \
          echo "unchanged." ;                                               \
@@ -585,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
Archive of old xscreensaver versions (http://www.jwz.org/xscreensaver/)