http://ftp.x.org/contrib/applications/xscreensaver-3.21.tar.gz

[xscreensaver] / hacks / Makefile.in

diff --git a/hacks/Makefile.in b/hacks/Makefile.in
index 72b8b52b6aa463bacd332f0c367c12cfae4040cb..d51a7252a257871ad6af872ba3849a211c29ca62 100644 (file)
--- a/hacks/Makefile.in
+++ b/hacks/Makefile.in
@@ -1,4 +1,4 @@
-# hacks/Makefile.in --- xscreensaver, Copyright (c) 1997 Jamie Zawinski.
+# hacks/Makefile.in --- xscreensaver, Copyright (c) 1997-1999 Jamie Zawinski.
 # the `../configure' script generates `hacks/Makefile' from this file.
 
 @SET_MAKE@
@@ -172,10 +172,14 @@ install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 install-program: $(EXES)
-       @if [ ! -d $(HACKDIR) ]; then $(INSTALL_DIRS) $(HACKDIR) ; fi ; \
+       @if [ ! -d $(install_prefix)$(HACKDIR) ]; then                  \
+         $(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ;                 \
+        fi ;                                                           \
        for program in $(EXES); do                                      \
-         echo $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ;      \
-         $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ;           \
+         echo $(INSTALL_PROGRAM) $$program                             \
+           $(install_prefix)$(HACKDIR)/$$program ;                     \
+         $(INSTALL_PROGRAM) $$program                                  \
+           $(install_prefix)$(HACKDIR)/$$program ;                     \
        done
 
 install-scripts: $(SCRIPTS) munge-scripts
@@ -185,8 +189,10 @@ install-scripts: $(SCRIPTS) munge-scripts
          else                                                          \
            p=$(srcdir)/$$program ;                                     \
          fi ;                                                          \
-         echo $(INSTALL_PROGRAM) $$p $(HACKDIR)/$$program ;            \
-         $(INSTALL_PROGRAM) $$p $(HACKDIR)/$$program ;                 \
+         echo $(INSTALL_PROGRAM) $$p                                   \
+           $(install_prefix)$(HACKDIR)/$$program ;                     \
+         $(INSTALL_PROGRAM) $$p                                        \
+           $(install_prefix)$(HACKDIR)/$$program ;                     \
        done
 
 munge-scripts: $(SCRIPTS)
@@ -205,25 +211,29 @@ munge-scripts: $(SCRIPTS)
 
 install-man: $(MEN)
        @men="$(MEN)" ;                                                 \
-       if [ ! -d $(man1dir) ]; then $(INSTALL_DIRS) $(man1dir) ; fi ;  \
+       if [ ! -d $(install_prefix)$(man1dir) ]; then                   \
+         $(INSTALL_DIRS) $(install_prefix)$(man1dir) ;                 \
+        fi ;                                                           \
        for man in $$men; do                                            \
          instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;     \
-         echo $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ;  \
-         $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ;       \
+         echo $(INSTALL_DATA) $(srcdir)/$$man                          \
+          $(install_prefix)$(man1dir)/$$instname ;                     \
+         $(INSTALL_DATA) $(srcdir)/$$man                               \
+           $(install_prefix)$(man1dir)/$$instname ;                    \
        done
 
 uninstall-program:
        @for program in $(EXES) $(SCRIPTS); do                          \
-         echo rm -f $(HACKDIR)/$$program ;                             \
-         rm -f $(HACKDIR)/$$program ;                                  \
+         echo rm -f $(install_prefix)$(HACKDIR)/$$program ;            \
+         rm -f $(install_prefix)$(HACKDIR)/$$program ;                 \
        done
 
 uninstall-man:
        @men="$(MEN)" ;                                                 \
        for man in $$men; do                                            \
          instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;     \
-         echo rm -f $(man1dir)/$$instname ;                            \
-         rm -f $(man1dir)/$$instname ;                                 \
+         echo rm -f $(install_prefix)$(man1dir)/$$instname ;           \
+         rm -f $(install_prefix)$(man1dir)/$$instname ;                \
        done
 
 clean: