Install images into separate directory

2 files changed, 7 insertions, 13 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 8d37e4b54387..bda938f720b3 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -3,7 +3,7 @@
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
-# $Id: Makefile,v 1.7 1997/04/30 00:16:34 paul Exp $
+# $Id: Makefile,v 1.8 1997/05/02 23:16:50 ache Exp $
 #
 
 DISTNAME=       analog2.11
@@ -24,11 +24,13 @@ do-install:
 		${PREFIX}/share/doc/analog
 	install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
 		${PREFIX}/lib/analog/lang
+	install -d -o nobody -g nogroup -m 755 \
+		${PREFIX}/www/data/images
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} Readme.html Licence \
 		${PREFIX}/share/doc/analog
 	cd ${WRKSRC}/images && \
-		${INSTALL_DATA} * ${PREFIX}/www/icons
+		${INSTALL_DATA} * ${PREFIX}/www/data/images
 	cd ${WRKSRC}/lang && \
 		${INSTALL_DATA} * ${PREFIX}/lib/analog/lang
 	cd ${WRKSRC} && \
diff --git a/www/analog/files/patch-ab b/www/analog/files/patch-ab
index 2b09ce53d253..3ceeff668c51 100644
--- a/www/analog/files/patch-ab
+++ b/www/analog/files/patch-ab
@@ -1,5 +1,5 @@
 *** analhead.h.orig	Fri Mar 14 20:33:09 1997
---- analhead.h	Sat May  3 05:11:35 1997
+--- analhead.h	Wed May  7 23:27:03 1997
 ***************
 *** 14,25 ****
   /* the name of your organisation or WWW host. This is used for printing
@@ -27,7 +27,7 @@
      lives. You don't really need these; they are just used in this file to
      build up other filenames. Note how you can stick together names by
 ***************
-*** 30,40 ****
+*** 30,36 ****
   /* the name of the file where the domain definitions live; see README.html
      for the format of this file */
   
@@ -35,11 +35,7 @@
   /* The name of the default logfile; use "stdin" for stdin.
      Can be a list, separated by commas (but no spaces). */
   
-! #define IMAGEDIR "/images/"
-  /* URL of the directory where the images for the graphical reports live.
-     The URL can be absolute, or relative to the output page: e.g., just the
-     empty string "" for the same directory as the output page. Ends with /. */
---- 29,39 ----
+--- 29,35 ----
   /* the name of the file where the domain definitions live; see README.html
      for the format of this file */
   
@@ -47,10 +43,6 @@
   /* The name of the default logfile; use "stdin" for stdin.
      Can be a list, separated by commas (but no spaces). */
   
-! #define IMAGEDIR "/icons/"
-  /* URL of the directory where the images for the graphical reports live.
-     The URL can be absolute, or relative to the output page: e.g., just the
-     empty string "" for the same directory as the output page. Ends with /. */
 ***************
 *** 93,106 ****
   #define CACHEFILE "none"