[Bobs-cvs] CVS: bobs/images Makefile.am,1.2,1.3 Makefile.in,1.1,1.2

[Joe Z. <jz...@us...>]

Update of /cvsroot/bobs/bobs/images
In directory sc8-pr-cvs1:/tmp/cvs-serv1209/bobs/images

Modified Files:
	Makefile.am Makefile.in 
Log Message:
All installed files now fall under ${prefix} and ${DESTDIR}. This should 
help with 'make rpm'.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/bobs/bobs/images/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	3 Feb 2003 05:51:42 -0000	1.2
+++ Makefile.am	5 Feb 2003 02:05:23 -0000	1.3
@@ -4,7 +4,4 @@
 
 dist_html_DATA = $(wildcard *.gif)
 
-uninstall-local:
-	rmdir $(htmldir)
-
 ## END

Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/images/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.in	3 Feb 2003 19:27:34 -0000	1.1
+++ Makefile.in	5 Feb 2003 02:05:23 -0000	1.2
@@ -75,9 +75,12 @@
 install_sh = @install_sh@
 myBOBSDATA = @myBOBSDATA@
 myCRONDIR = @myCRONDIR@
+myCRONTABDIR = @myCRONTABDIR@
 myHTTPDUSER = @myHTTPDUSER@
 myPASS = @myPASS@
 myWEBDIR = @myWEBDIR@
+myrealBOBSDATA = @myrealBOBSDATA@
+myrealWEBDIR = @myrealWEBDIR@
 SUBDIRS = bar menu
 
 htmldir = $(myWEBDIR)/images
@@ -323,7 +326,7 @@
 
 mostlyclean-am: mostlyclean-generic
 
-uninstall-am: uninstall-dist_htmlDATA uninstall-info-am uninstall-local
+uninstall-am: uninstall-dist_htmlDATA uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
@@ -340,12 +343,8 @@
 	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
 	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
 	uninstall uninstall-am uninstall-dist_htmlDATA \
-	uninstall-info-am uninstall-info-recursive uninstall-local \
-	uninstall-recursive
-
+	uninstall-info-am uninstall-info-recursive uninstall-recursive
 
-uninstall-local:
-	rmdir $(htmldir)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: