Merge 8b0dc94428 into 0efc6cb6fc

GUI/xephem/Makefile

@@ -197,21 +197,23 @@ OBJS =			\
 	xephem.o	\
 	xmisc.o
 
-all: libs xephem xephem.1
+LIBRARIES := libip liblilxml libjpegd libpng libz
 
-xephem: $(INCS) $(OBJS)
+all: $(LIBRARIES) xephem xephem.1
+
+xephem: $(INCS) $(OBJS) $(LIBRARIES)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
 xephem.1: xephem.man
 	nroff -man $? > $@
 
-libs:
-	cd ../../libastro; make
-	cd ../../libip; make
-	cd ../../libjpegd; make
-	cd ../../liblilxml; make
-	cd ../../libpng; make
-	cd ../../libz; make
+libs: $(LIBRARIES)
+
+$(LIBRARIES): libastro
+	$(MAKE) --directory=../../$@
+
+libastro:
+	$(MAKE) --directory=../../$@
 
 clean:
 	rm -fr *.o ../../lib*/*.[ao]

Site/faq.html

@@ -522,11 +522,11 @@ using XEphem on my web site or publications?</b>
     placed somewhere on each such page:
     <p>
     <pre>
-    &lt;a target="csiwin" href="https://www.ClearSkyInstitute.com/xephem/xephem.html"&gt;Created using &lt;b&gt;XEphem&lt;/b&gt;&lt;/a&gt;
+    &lt;a target="csiwin" href="https://xephem.github.io/XEphem/Site/xephem.html"&gt;Created using &lt;b&gt;XEphem&lt;/b&gt;&lt;/a&gt;
     </pre>
     <p>
     It should look and work like this:
-    <a target="csiwin" href="https://www.ClearSkyInstitute.com/xephem/xephem.html">
+    <a target="csiwin" href="https://xephem.github.io/XEphem/Site/xephem.html">
     Created using <b>XEphem</b></a>.
     <p>
     Regarding publications, the Postscript files generated by XEphem already