diff --git a/Makefile b/Makefile
index 892e715c9f55e9bdba0067845f055c6f402015ed..8377be37d33b776b3c3feddb7acd7e69d2a3d2a8 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,7 @@ includes:
 
 
 libraries:
-	-$(RM) -r $(LIBDIR)
-	mkdir $(LIBDIR)
+	-mkdir $(LIBDIR)
 	for i in $(SUBDIRS) ;	\
 	do	\
 		echo making libraries in directory $$i; \
@@ -51,7 +50,7 @@ depend: includes
 
 
 clean:
-	rm -vf *~ core
+	$(RM) *~ core
 	for i in $(SUBDIRS); \
 	do \
 	   echo making clean in directory $$i; \
diff --git a/scripts/Makefile b/scripts/Makefile
index a2a2933e9f57f2d4a2f538cd7704e758162f391d..6da10fa0a75bba0e07ef906cfb1f3f3ec73d45e5 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,3 +1,8 @@
+TOPDIR = /usr/lyskom
+SCRIPTDIR = $(TOPDIR)/scripts
+
+include $(SCRIPTDIR)/import.make
+
 all:;
 depend:;
 install:;
@@ -7,4 +12,4 @@ binaries:;
 	
 
 clean:
-	rm -vf *~ core
+	$(RM) *~ core
diff --git a/src/Makefile b/src/Makefile
index 850c5a965b4d6ed6cac6c976e45b01feead3a1f8..bdeabed4a62269fecb4553de984964bdf33e209c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -51,7 +51,7 @@ depend:
 
 
 clean:
-	rm -vf *~ core
+	$(RM) *~ core
 	for i in $(SUBDIRS); \
 	do \
 	   echo making clean in directory $$i; \
diff --git a/src/include/server/Makefile b/src/include/server/Makefile
index 2dd23253c7f88cd8eb781efa82655faea9e78b60..29b539d16ce8620f1ed0194cd2e2750cff475143 100644
--- a/src/include/server/Makefile
+++ b/src/include/server/Makefile
@@ -22,6 +22,6 @@ includes:
 	done
 
 clean:
-	rm -vf ${OBJECTS} *~ core temp-Makefile Distfile *.o
+	$(RM) ${OBJECTS} *~ core temp-Makefile Distfile *.o
 
 depend:;
diff --git a/src/libraries/Makefile b/src/libraries/Makefile
index ecfd9208eb8f52846ec40307afd13ad100ca756a..3cc5db29fa4119512032b9498901bf3b06394338 100644
--- a/src/libraries/Makefile
+++ b/src/libraries/Makefile
@@ -47,7 +47,7 @@ install:
 
 
 clean:
-	rm -vf *~ core
+	$(RM) *~ core
 	for i in $(SUBDIRS); \
 	do \
 	   echo making clean in directory $$i; \
diff --git a/src/libraries/libansi/Makefile b/src/libraries/libansi/Makefile
index 6b4cea90163023774a8ba2c619cb3d0042e34435..db1a7b19c0a6be7f6f8ff31f561764a0729b1257 100644
--- a/src/libraries/libansi/Makefile
+++ b/src/libraries/libansi/Makefile
@@ -12,8 +12,7 @@ LIBOBJS = strerror.o
 all:	$(LIBNAME)
 
 libmisc.a: $(LIBOBJS)
-	rm -f $(LIBNAME)
-	ar qc $(LIBNAME) $(LIBOBJS)
+	$(AR) $(ARFLAGS) $(LIBNAME) $?
 	ranlib $(LIBNAME)
 
 includes:;
@@ -26,7 +25,7 @@ libraries: $(LIBNAME)
 binaries:;
 
 clean:
-	rm -vf ${LIBOBJS} *~ core temp-Makefile Distfile *.o
+	$(RM) ${LIBOBJS} *~ core temp-Makefile Distfile *.o
 
 
 # Recreate the Makefile
diff --git a/src/libraries/libmisc/ChangeLog b/src/libraries/libmisc/ChangeLog
index ddcda9fdbf96a77f224dd3e6b812ef0fb209ea1d..55adb39523325bda00b8370388d52e3efd743f9f 100644
--- a/src/libraries/libmisc/ChangeLog
+++ b/src/libraries/libmisc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 27 07:20:34 1991  Per Cederqvist  (ceder at lysator)
+
+	* pom.c: Tog bort variablerna ts och pmt som inte anv{nds.
+
 Sat Jul  6 05:43:41 1991  Per Cederqvist  (ceder at lysator)
 
 	* Fullbordade {ndringen fr}n char till unsigned char i
diff --git a/src/libraries/libmisc/Makefile b/src/libraries/libmisc/Makefile
index ed18a2d1f435692495b12715990b48058372b298..cd4627ab6a771f0883e17e78cf5960c67f6a387f 100644
--- a/src/libraries/libmisc/Makefile
+++ b/src/libraries/libmisc/Makefile
@@ -29,7 +29,7 @@ INSTALL-HDRS = pom.h s-collat-tabs.h s-string.h zmalloc.h
 all:	$(LIBNAME)
 
 $(LIBNAME): $(LIBOBJS)
-	ar r $(LIBNAME) $?
+	$(AR) $(ARFLAGS) $(LIBNAME) $?
 	ranlib $(LIBNAME)
 
 libraries: $(LIBNAME)
@@ -50,7 +50,7 @@ testnumlist: testnumlist.o numlist.o
 
 
 clean:
-	rm -vf ${OBJECTS} *~ core temp-Makefile Distfile *.o
+	$(RM) ${OBJECTS} *~ core temp-Makefile Distfile *.o
 
 
 # Recreate the Makefile
diff --git a/src/libraries/libmisc/pom.c b/src/libraries/libmisc/pom.c
index 41e8d4c7862ec3e84b598086ca9c69bad9f58f97..4b26fb2430adafa02233eecdd66be31979380f88 100644
--- a/src/libraries/libmisc/pom.c
+++ b/src/libraries/libmisc/pom.c
@@ -19,7 +19,9 @@
 
 #define RADS	(M_PI/180.0)
 
+#if 0
 static	char		* pmt[] = { "NM", "FQ", "FM", "LQ" };
+#endif
 static	short		  ix;
 static	double		  m;		/* Sun's Mean Anomaly */
 static	double		  mp;		/* Moon's Mean Anomaly */
@@ -142,7 +144,6 @@ phase_of_the_moon (struct tm	* when)
 {
     int		  p1, p2, p3, p4;
     char	  sgn;
-    long	  ts;
     double	  tmp;
     struct pom	  result;
 
diff --git a/src/server/Makefile b/src/server/Makefile
index be1782a82e91fe34adfe9b5c1fcba5da15e44943..d4179aaca9c3e2d17c4658c6b747cdbaf492c9c0 100755
--- a/src/server/Makefile
+++ b/src/server/Makefile
@@ -126,12 +126,12 @@ install:  $(PROGRAMS)
 # Don't strip ramkomd - we want debugging info!
 
 clean:
-	rm -vf *.o *~ core $(PROGRAMS) $(SPECIALS) TAGS
+	$(RM) *.o *~ core $(PROGRAMS) $(SPECIALS) TAGS
 
 specials: $(SPECIALS)
 
 tags: $(SRCS) $(HDRS)
-	rm -f TAGS
+	$(RM) TAGS
 	etags -t $(INCLUDEDIR)/*.h *.[hc]
 
 include $(SCRIPTDIR)/Parallell-depend.make