[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-dev: [PATCH] Survive broken groff



I had to make these changes to the
gaf.git-9dde0233ebed32065511b567445f9f34d4b3bea1 snapshot in order to
get it to build on my rather old PC.  It was something about my groff
not having the "html" device.

2007-07-24  Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>

	* gnetlist/docs/Makefile.am, gsymcheck/docs/Makefile.am,
	  symbols/documentation/Makefile.am: Use $(GROFF) provided by
	  config.status instead of futzing around with "which".  Move
	  the output file onto $*.html only if $(GROFF) works.
Index: gaf.git/gnetlist/docs/Makefile.am
diff -u -p -- gaf.git/gnetlist/docs/Makefile.am.borig gaf.git/gnetlist/docs/Makefile.am
--- gaf.git/gnetlist/docs/Makefile.am
+++ gaf.git/gnetlist/docs/Makefile.am	2007-07-07 18:45:53.000000000 +0200
@@ -19,14 +19,14 @@ docsman_DATA = gnetlist.html
 %.html: %.1
 	@echo "Creating html manpage (using groff)"
 	@rm -rf $*.tmp
-	@if which groff >/dev/null 2>/dev/null; then             \
-		LC_NUMERIC=C groff -man -T html  $*.1 >$*.tmp   ;\
+	@if test "x$(GROFF)" != xno; then                        \
+		LC_NUMERIC=C $(GROFF) -man -T html  $*.1 >$*.tmp;\
+		mv -f $*.tmp $*.html                            ;\
 	else                                                     \
 		echo "** Did not find groff **"                 ;\
 		echo "Some Documentation might not be correct!" ;\
                 touch $*.html                                   ;\
 	fi
-	@mv -f $*.tmp $*.html
 
 gnetlist.html: gnetlist.1
 
Index: gaf.git/gsymcheck/docs/Makefile.am
diff -u -p -- gaf.git/gsymcheck/docs/Makefile.am.borig gaf.git/gsymcheck/docs/Makefile.am
--- gaf.git/gsymcheck/docs/Makefile.am
+++ gaf.git/gsymcheck/docs/Makefile.am	2007-07-07 19:23:43.000000000 +0200
@@ -12,14 +12,14 @@ docsman_DATA = gsymcheck.html
 %.html: %.1
 	@echo "Creating html manpage (using groff)"
 	@rm -rf $*.tmp
-	@if which groff >/dev/null 2>/dev/null; then             \
-		LC_NUMERIC=C groff -man -T html  $*.1 >$*.tmp   ;\
+	@if test "x$(GROFF)" != xno; then                        \
+		LC_NUMERIC=C $(GROFF) -man -T html  $*.1 >$*.tmp;\
+		mv -f $*.tmp $*.html                            ;\
 	else                                                     \
 		echo "** Did not find groff **"                 ;\
 		echo "Some Documentation might not be correct!" ;\
                 touch $*.html                                   ;\
 	fi
-	@mv -f $*.tmp $*.html
 
 gsymcheck.html: gsymcheck.1
 
Index: gaf.git/symbols/documentation/Makefile.am
diff -u -p -- gaf.git/symbols/documentation/Makefile.am.borig gaf.git/symbols/documentation/Makefile.am
--- gaf.git/symbols/documentation/Makefile.am
+++ gaf.git/symbols/documentation/Makefile.am	2007-07-07 18:59:03.000000000 +0200
@@ -22,14 +22,14 @@ BUILT_SOURCES = geda.pic nc.pdf nc.ps
 %.ps: %.doc
 	@echo "Creating ps (using groff)"
 	@rm -rf $*.tmp
-	@if which groff >/dev/null 2>/dev/null; then              \
-		LC_NUMERIC=C groff -t -sp -ms $*.doc >$*.tmp ;\
+	@if test "x$(GROFF)" != xno; then                        \
+		LC_NUMERIC=C $(GROFF) -t -sp -ms $*.doc >$*.tmp ;\
+		mv -f $*.tmp $*.ps                              ;\
 	else						         \
 		echo "** Did not find groff **"                 ;\
 		echo "Some Documentation might not be correct!" ;\
 		touch $*.ps                                     ;\
 	fi
-	@mv -f $*.tmp $*.ps
 
 %.pdf: %.ps
 	@echo "Creating pdf (using ps2pdf)"

_______________________________________________
geda-dev mailing list
geda-dev@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev