shithub: mc

Download patch

ref: a349fd1e69f7381661b772b84d910e2e0ad807c4
parent: cc1be5641df28864deb468d47577be35a25e0c03
author: Ori Bernstein <[email protected]>
date: Thu Dec 25 18:49:39 EST 2014

Make installation work correctly.

--- a/6/mkfile
+++ b/6/mkfile
@@ -1,4 +1,5 @@
 </$objtype/mkfile
+
 CC=pcc
 CFLAGS=-c -D_POSIX_SOURCE -D_SUSV2_SOURCE -D_C99_SNPRINTF_EXTENSION -I../parse -I../mi
 LDFLAGS=-L../parse -lparse -L../mi -lmi
@@ -17,4 +18,7 @@
 
 LIB=../parse/libparse.a ../mi/libmi.a
 
+HFILES=asm.h ../parse/parse.h ../mi/mi.h ../config.h
+
+BIN=/$objtype/bin
 </sys/src/cmd/mkone
--- a/doc/mkfile
+++ b/doc/mkfile
@@ -4,3 +4,7 @@
 	myrbuild.1 \
 
 all:V: $MANS
+
+install:V:
+	echo -n ''
+
--- a/libstd/mkfile
+++ b/libstd/mkfile
@@ -69,6 +69,11 @@
 
 all:V: lib$STDLIB.a lib$SYSLIB.a
 
+install:V: all
+	mkdir -p /$objtype/lib/myr/
+	cp lib$STDLIB.a lib$SYSLIB.a /$objtype/lib/myr/
+	cp $STDLIB $SYSLIB /$objtype/lib/myr/
+
 lib$STDLIB.a: $STDSRC $ASMSRC lib$SYSLIB.a
 	../myrbuild/$O.out -I. -C../6/$O.out -M../muse/$O.out -l $STDLIB $STDSRC $STDASMSRC
 
--- a/mi/mkfile
+++ b/mi/mkfile
@@ -10,7 +10,7 @@
         match.$O\
 	df.$O\
 
-HFILES=mi.h
+HFILES=mi.h ../config.h ../parse/parse.h
 
 </sys/src/cmd/mklib
 
--- a/muse/mkfile
+++ b/muse/mkfile
@@ -9,4 +9,5 @@
 
 LIB=../parse/libparse.a
 
+BIN=/$objtype/bin
 </sys/src/cmd/mkone
--- a/myrbuild/mkfile
+++ b/myrbuild/mkfile
@@ -7,4 +7,5 @@
 OFILES=myrbuild.$O
 LIB=../parse/libparse.a
 
+BIN=/$objtype/bin
 </sys/src/cmd/mkone
--- a/parse/mkfile
+++ b/parse/mkfile
@@ -18,10 +18,14 @@
     use.$O \
     util.$O
 
-HFILES=parse.h
+HFILES=parse.h ../config.h
 CLEANFILES=gram.c gram.h
 
 </sys/src/cmd/mklib
+
+install:V: $LIB
+	touch $LIB
+	
 
 gram.c gram.h: gram.y
 	yacc -d -S gram.y
--- a/rt/mkfile
+++ b/rt/mkfile
@@ -1,6 +1,13 @@
 </$objtype/mkfile
 
+all:V: _myrrt.$O
+
 _myrrt.$O: _myrrt-plan9.s
 	$AS -o _myrrt.$O _myrrt-plan9.s
 
-</sys/src/cmd/mkone
+install:V:
+	mkdir -p /$objtype/lib/myr
+	cp _myrrt.$O /$objtype/lib/myr
+
+clean:V:
+	rm -f _myrrt.$O
\ No newline at end of file