shithub: mc

Download patch

ref: d382b545553959a59667f7b07dc88bb223eb6aa0
parent: 1c11729fff3d5d0c1689df73cd0bd8f58dd322d4
author: Ori Bernstein <[email protected]>
date: Tue Dec 17 18:08:07 EST 2013

Install the manpages

--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+SUB=doc
 MYRLIB=regex
 MYRSRC= \
 	compile.myr \
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,9 +5,13 @@
 all:
 	
 install:
-	@echo install -m 644 $(MAN) $(INST_ROOT)/share/man/man1; \
-	mkdir -p $(INST_ROOT)/share/man/man1; \
-	install -m 644 $(MAN) $(INST_ROOT)/share/man/man1; \
+	@for i in $(MAN); do \
+	    MANSECT=$$(echo $$i | awk -F. '{print $$NF}'); \
+	    echo mkdir -p $(INST_ROOT)/share/man/man$$MANSECT; \
+	    echo install -m 644 $(MAN) $(INST_ROOT)/share/man/man$${MANSECT}; \
+	    mkdir -p $(INST_ROOT)/share/man/man$$MANSECT; \
+	    install -m 644 $(MAN) $(INST_ROOT)/share/man/man$${MANSECT}; \
+	done \
 
 clean:
 
--- a/mk/myr.mk
+++ b/mk/myr.mk
@@ -2,8 +2,29 @@
     _LIBNAME=lib$(MYRLIB).a
 endif
 
-all: $(_LIBNAME) $(MYRBIN)
+all: subdirs $(_LIBNAME) $(MYRBIN) 
 
+subdirs:
+	@for i in $(SUB); do (\
+	    cd $$i && \
+	    $(MAKE) || \
+	    exit 1 \
+	) || exit 1; done
+
+subdirs-clean:
+	@for i in $(SUB); do (\
+	    cd $$i && \
+	    $(MAKE) clean|| \
+	    exit 1 \
+	); done
+
+subdirs-install:
+	@for i in $(SUB); do (\
+	    cd $$i && \
+	    $(MAKE) install|| \
+	    exit 1 \
+	); done
+
 $(_LIBNAME): $(MYRSRC) $(ASMSRC)
 	myrbuild -l $(MYRLIB) $^
 
@@ -13,12 +34,12 @@
 OBJ=$(MYRSRC:.myr=.o) $(ASMSRC:.s=.o)
 USE=$(MYRSRC:.myr=.use) $(MYRLIB)
 .PHONY: clean
-clean:
+clean: subdirs-clean
 	rm -f $(OBJ)
 	rm -f $(USE)
 	rm -f lib$(MYRLIB).a
 
-install: install-bin install-lib
+install: subdirs-install install-bin install-lib
 
 install-bin: $(MYRBIN)
 	@if [ ! -z "$(MYRBIN)" ]; then \
--- a/test/regex-basic.myr
+++ b/test/regex-basic.myr
@@ -1,5 +1,4 @@
 use std
-use regex
 
 use "testmatch.use"