slweb

чување ea3ec5fa35fee4dd165a3cc69f7f733246ff8551
родитељ d32c5e929e426bf4b7f97ffb009f0c21b17ac5ba
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Wed,  6 Mar 2024 22:20:30 +0100

Merge branch 'master' of ssh://git.sr.ht/~strahinja/slweb

Diffstat:
M
INSTALL
 | 
2
+-
M
Makefile
 | 
6
++++--
M
config.mk
 | 
2
+-
M
examples/Makefile
 | 
32
+++++---------------------------

измењених датотека: 4, додавања: 11(+), брисања: 31(-)
diff --git a/INSTALL b/INSTALL
@@ -40,7 +40,7 @@ Replace gcc in CC with cc and add -D_BSD_SOURCE, eg:
 
 	# CC='cc -g -Wall -pedantic -std=c99 -D_POSIX_C_SOURCE=200809L
 		-D_XOPEN_SOURCE=700 -D_BSD_SOURCE}' \
-		make install
+		make -e install
 
 and change MANPREFIX to
 
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ version:
 
 slweb.o: slweb.c defs.h utf8.h version.h
 
-$(PROG).1: $(PROG).1.in version date
+$(MANPAGE): $(MANPAGE).in version date
 
 version.h: version.h.in version date
 
@@ -39,13 +39,15 @@ clean:
 	rm -f version date version.h *.o *.xz *~ $(PROG) $(MANPAGE)
 
 install: all
-	$(INSTALL) -Dm 0644 $(MANPAGE) $(MANPREFIX)/man1/$(MANPAGE)
 	make -C examples install
+	umask 022
+	$(INSTALL) -Dm 0644 $(MANPAGE) $(MANPREFIX)/man1/$(MANPAGE)
 	$(INSTALL) -Dm 0644 README $(DOCDIR)/README
 	$(INSTALL) -Dm 0644 LICENSE $(DOCDIR)/LICENSE
 	$(INSTALL) -Dm 0755 $(PROG) $(BINDIR)/$(PROG)
 
 uninstall:
+	make -C examples uninstall
 	rm -f $(MANPREFIX)/man1/$(MANPAGE)
 	rmdir $(MANPREFIX)/man1 2>/dev/null || true
 	rmdir $(MANPREFIX) 2>/dev/null || true
diff --git a/config.mk b/config.mk
@@ -19,7 +19,7 @@ PROG		= slweb
 # Derived macros
 BINDIR		= $(PREFIX)/bin
 DOCDIR		= $(PREFIX)/share/doc/$(PROG)
-EXDIR		= $(DOCDIR)
+EXDIR		= $(DOCDIR)/examples
 MANPREFIX	= $(PREFIX)/share/man
 # OpenBSD
 #MANPREFIX	= $(PREFIX)/man
diff --git a/examples/Makefile b/examples/Makefile
@@ -14,34 +14,12 @@ clean:
 	rm -f *~
 
 install: all
-	$(INSTALL) -Dm 0644 basic/index.html $(EXDIR)/basic/index.html
-	$(INSTALL) -Dm 0644 blockquote/index.html $(EXDIR)/blockquote/index.html
-	$(INSTALL) -Dm 0644 breakmarks/index.html $(EXDIR)/breakmarks/index.html
-	$(INSTALL) -Dm 0644 csv-tsv/index-csv.html $(EXDIR)/csv-tsv/index-csv.html
-	$(INSTALL) -Dm 0644 csv-tsv/index.html $(EXDIR)/csv-tsv/index.html
-	$(INSTALL) -Dm 0644 footnotes/inline.html $(EXDIR)/footnotes/inline.html
-	$(INSTALL) -Dm 0644 footnotes/index.html $(EXDIR)/footnotes/index.html
-	$(INSTALL) -Dm 0644 links/index.html $(EXDIR)/links/index.html
-	$(INSTALL) -Dm 0644 lists/index.html $(EXDIR)/lists/index.html
-	$(INSTALL) -Dm 0644 macros/index.html $(EXDIR)/macros/index.html
-	$(INSTALL) -Dm 0644 math/index.html $(EXDIR)/math/index.html
-	$(INSTALL) -Dm 0644 tables/index.html $(EXDIR)/tables/index.html
-	$(INSTALL) -Dm 0644 tags/index.html $(EXDIR)/tags/index.html
+	find . -type f \( -name '*.slw' -o -name '*.html' -o -name '*.css' \) \
+		-exec sh -c 'umask 022; \
+		$(INSTALL) -Dm 0644 {} $(EXDIR)/{}' shell \;
 
 uninstall:
-	rm -f $(EXDIR)/basic/index.html
-	rm -f $(EXDIR)/blockquote/index.html
-	rm -f $(EXDIR)/breakmarks/index.html
-	rm -f $(EXDIR)/csv-tsv/index-csv.html
-	rm -f $(EXDIR)/csv-tsv/index.html
-	rm -f $(EXDIR)/footnotes/inline.html
-	rm -f $(EXDIR)/footnotes/index.html
-	rm -f $(EXDIR)/links/index.html
-	rm -f $(EXDIR)/lists/index.html
-	rm -f $(EXDIR)/macros/index.html
-	rm -f $(EXDIR)/math/index.html
-	rm -f $(EXDIR)/tables/index.html
-	rm -f $(EXDIR)/tags/index.html
-	rmdir $(EXDIR) 2>/dev/null || true
+	find $(EXDIR) -type f -exec rm {} \; || true
+	find $(EXDIR) -depth -type d -exec rmdir {} \; || true
 
 .PHONY: all clean install uninstall