--- loncom/build/Makefile	2001/12/19 21:27:46	1.50
+++ loncom/build/Makefile	2001/12/29 18:52:08	1.51
@@ -1,12 +1,14 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison
-# $Id: Makefile,v 1.50 2001/12/19 21:27:46 harris41 Exp $
+# $Id: Makefile,v 1.51 2001/12/29 18:52:08 harris41 Exp $
 
 CDTARGET="."
 CDFSLOC="/mnt/loncapacd/install.lon-capa.org/3.1/currentcdsource"
 DIST="default"
 CATEGORY="development"
+SOURCE="../.."
+TARGET=""
 
 all: 
 	# nothing yet here
@@ -108,17 +110,17 @@ warningnote:
 		cat WARNINGS; \
 	fi
 
-install: Makefile.install
+install: Makefile.install Makefile
 	echo -n "" > WARNINGS
-	make -f Makefile.install SOURCE="../.." TARGET="" directories
-	make -f Makefile.install SOURCE="../.." TARGET="" files
-	make -f Makefile.install SOURCE="../.." TARGET="" links
+	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" directories
+	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
+	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" links
 	make configinstall
 	make warningnote
 
 Makefile.install: ../../doc/loncapafiles/loncapafiles.lpml lpml_parse.pl
 	cat ../../doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl install $(CATEGORY) $(DIST) "../.." "" > \
+	perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" "$(TARGET)" > \
 	Makefile.install
 
 build: Makefile.build pod2html.sh pod2man.sh