diff -cr ps2pk16beta1/PSres/Makefile.emx ps2pk16beta1a/PSres/Makefile.emx
*** ps2pk16beta1/PSres/Makefile.emx	Fri Feb  6 17:18:02 1998
--- ps2pk16beta1a/PSres/Makefile.emx	Fri Mar  6 11:35:02 1998
***************
*** 4,9 ****
--- 4,12 ----
  # Version 1.6: Feb. 1995
  #
  
+ # some UNIX utilities
+ RM=rm
+ 
  # emTeX root directory
  EMTEXDIR = c:\emtex
  
***************
*** 40,46 ****
  all: psres.a mkpsres.exe
  
  psres.a: PSres.o
! 	-rm -f psres.a
  	ar rv psres.a PSres.o
  	ar s psres.a
  
--- 43,49 ----
  all: psres.a mkpsres.exe
  
  psres.a: PSres.o
! 	$(RM) -f psres.a
  	ar rv psres.a PSres.o
  	ar s psres.a
  
***************
*** 58,67 ****
  	${INSTALL} mkpsres.doc $(MANDIR)\mkpsres.doc
  
  mostlyclean:
! 	-rm -f *.o psres.dpr
  
  maintainer-clean clean:
! 	-rm -f *.o psres.dpr psres.a *.exe
  
  distclean:
! 	-rm -f *.o psres.dpr psres.a *.exe *~ *.bak Makefile 
--- 61,70 ----
  	${INSTALL} mkpsres.doc $(MANDIR)\mkpsres.doc
  
  mostlyclean:
! 	$(RM) -f *.o psres.dpr
  
  maintainer-clean clean:
! 	$(RM) -f *.o psres.dpr psres.a *.exe
  
  distclean:
! 	$(RM) -f *.o psres.dpr psres.a *.exe *~ *.bak Makefile 
diff -cr ps2pk16beta1/common/Makefile.emx ps2pk16beta1a/common/Makefile.emx
*** ps2pk16beta1/common/Makefile.emx	Thu Feb 26 16:44:07 1998
--- ps2pk16beta1a/common/Makefile.emx	Fri Mar  6 11:33:58 1998
***************
*** 4,17 ****
  # Version 1.1: Feb 1998
  #
  
  # Compiler directives and other goodies
  CC     = gcc
  SYSTEM = MSDOS
  DEBUG  = -g
! CFLAGS = -D$(SYSTEM) -O $(DEBUG)
  
  common.a: basics.o filenames.o psearch.o strexpr.o texfiles.o
! 	-rm -f common.a
  	ar rv common.a basics.o filenames.o psearch.o strexpr.o texfiles.o
  	ar s common.a
  
--- 4,20 ----
  # Version 1.1: Feb 1998
  #
  
+ # some UNIX utilities
+ RM=rm
+ 
  # Compiler directives and other goodies
  CC     = gcc
  SYSTEM = MSDOS
  DEBUG  = -g
! CFLAGS = -D$(SYSTEM) -O $(DEBUG) -DHAVE_STRCHR
  
  common.a: basics.o filenames.o psearch.o strexpr.o texfiles.o
! 	$(RM) -f common.a
  	ar rv common.a basics.o filenames.o psearch.o strexpr.o texfiles.o
  	ar s common.a
  
***************
*** 31,40 ****
  	$(CC) $(CFLAGS) -c texfiles.c
  
  mostlyclean:
! 	-rm -f *.o
  
  maintainer-clean clean:
! 	-rm -f *.o common.a
  
  distclean: clean
! 	-rm -f *.o common.a *~ *.bak Makefile 
--- 34,43 ----
  	$(CC) $(CFLAGS) -c texfiles.c
  
  mostlyclean:
! 	$(RM) -f *.o
  
  maintainer-clean clean:
! 	$(RM) -f *.o common.a
  
  distclean: clean
! 	$(RM) -f *.o common.a *~ *.bak Makefile 
diff -cr ps2pk16beta1/ps2pk/Makefile.emx ps2pk16beta1a/ps2pk/Makefile.emx
*** ps2pk16beta1/ps2pk/Makefile.emx	Fri Feb 27 09:57:27 1998
--- ps2pk16beta1a/ps2pk/Makefile.emx	Fri Mar  6 11:31:50 1998
***************
*** 4,9 ****
--- 4,12 ----
  # Version 1.6: Feb. 1998
  #
  
+ # some UNIX utilities
+ RM=rm
+ 
  # emTeX root directory
  EMTEXDIR = c:\emtex
  
***************
*** 119,154 ****
  
  mostlyclean:
  [
! 	-rm -f *.o psres.dpr
  	cd ..\type1
! 	-$(MAKE) -f Makefile.emx mostlyclean
  	cd ..\common
! 	-$(MAKE) -f Makefile.emx mostlyclean
  	cd ..\PSres
! 	-$(MAKE) -f Makefile.emx mostlyclean
  ]
  
  maintainer-clean clean:
  [
! 	-rm -f *.o psres.dpr
! 	-rm -f *.exe
  	cd ..\type1
! 	-$(MAKE) -f Makefile.emx clean
  	cd ..\common
! 	-$(MAKE) -f Makefile.emx clean
  	cd ..\PSres
! 	-$(MAKE) -f Makefile.emx clean
  ]
  
  distclean:
  [
! 	-rm -f *.o psres.dpr
! 	-rm -f *.exe
! 	-rm -f *~ *.bak Makefile
  	cd ..\type1
! 	-$(MAKE) -f Makefile.emx distclean
  	cd ..\common
! 	-$(MAKE) -f Makefile.emx distclean
  	cd ..\PSres
! 	-$(MAKE) -f Makefile.emx distclean
  ]
--- 122,157 ----
  
  mostlyclean:
  [
! 	$(RM) -f *.o psres.dpr
  	cd ..\type1
! 	$(MAKE) -f Makefile.emx mostlyclean
  	cd ..\common
! 	$(MAKE) -f Makefile.emx mostlyclean
  	cd ..\PSres
! 	$(MAKE) -f Makefile.emx mostlyclean
  ]
  
  maintainer-clean clean:
  [
! 	$(RM) -f *.o psres.dpr
! 	$(RM) -f *.exe
  	cd ..\type1
! 	$(MAKE) -f Makefile.emx clean
  	cd ..\common
! 	$(MAKE) -f Makefile.emx clean
  	cd ..\PSres
! 	$(MAKE) -f Makefile.emx clean
  ]
  
  distclean:
  [
! 	$(RM) -f *.o psres.dpr
! 	$(RM) -f *.exe
! 	$(RM) -f *~ *.bak Makefile
  	cd ..\type1
! 	$(MAKE) -f Makefile.emx distclean
  	cd ..\common
! 	$(MAKE) -f Makefile.emx distclean
  	cd ..\PSres
! 	$(MAKE) -f Makefile.emx distclean
  ]
diff -cr ps2pk16beta1/ps2pk/pkout.c ps2pk16beta1a/ps2pk/pkout.c
*** ps2pk16beta1/ps2pk/pkout.c	Fri Feb 27 10:23:38 1998
--- ps2pk16beta1a/ps2pk/pkout.c	Fri Mar  6 11:14:06 1998
***************
*** 514,537 ****
     while (dpi < size) {
        size = size / 1.095445115;
        magstep -= 0.5;
!       if (dpi == PSPKINT(size + 0.5)) {
           sprintf(mag_str, "magstep(%.1f)", magstep);
           return mag_str;
        }
        if (dpi > size) {
!          sprintf(mag_str, "%d+%d/%d", PSPKINT(dpi/BDPI), dpi%BDPI, BDPI);
           return mag_str;
        }
     }
     while (dpi > size) {
        size = size * 1.095445115;
        magstep += 0.5;
!       if (dpi == PSPKINT(size + 0.5)) {
           sprintf(mag_str, "magstep(%.1f)", magstep);
           return mag_str;
        }
        if (dpi < size) {
!          sprintf(mag_str, "%d+%d/%d", PSPKINT(dpi/BDPI), dpi%BDPI, BDPI);
           return mag_str;
        }
     }
--- 514,537 ----
     while (dpi < size) {
        size = size / 1.095445115;
        magstep -= 0.5;
!       if (dpi == INT(size + 0.5)) {
           sprintf(mag_str, "magstep(%.1f)", magstep);
           return mag_str;
        }
        if (dpi > size) {
!          sprintf(mag_str, "%d+%d/%d", INT(dpi/BDPI), dpi%BDPI, BDPI);
           return mag_str;
        }
     }
     while (dpi > size) {
        size = size * 1.095445115;
        magstep += 0.5;
!       if (dpi == INT(size + 0.5)) {
           sprintf(mag_str, "magstep(%.1f)", magstep);
           return mag_str;
        }
        if (dpi < size) {
!          sprintf(mag_str, "%d+%d/%d", INT(dpi/BDPI), dpi%BDPI, BDPI);
           return mag_str;
        }
     }
diff -cr ps2pk16beta1/type1/Makefile.emx ps2pk16beta1a/type1/Makefile.emx
*** ps2pk16beta1/type1/Makefile.emx	Fri Feb  6 17:18:38 1998
--- ps2pk16beta1a/type1/Makefile.emx	Fri Mar  6 11:33:06 1998
***************
*** 5,10 ****
--- 5,13 ----
  # Version 1.5: Feb. 1998
  #
  
+ # some UNIX utilities
+ RM=rm
+ 
  OBJ = arith.o curves.o fontfcn.o hints.o lines.o objects.o paths.o \
        regions.o scanfont.o spaces.o t1funcs.o t1info.o t1io.o \
        t1snap.o t1stub.o token.o type1.o util.o
***************
*** 18,24 ****
  	$(CC) -o $*.o $(CFLAGS) -c $<
  
  type1.a: $(OBJ)
! 	-rm -f type1.a
  	ar rv type1.a @$(mktmp $(^:t"\\n")\n)
  	ar s type1.a
  
--- 21,27 ----
  	$(CC) -o $*.o $(CFLAGS) -c $<
  
  type1.a: $(OBJ)
! 	$(RM) -f type1.a
  	ar rv type1.a @$(mktmp $(^:t"\\n")\n)
  	ar s type1.a
  
***************
*** 27,39 ****
  	emxbind -b $(EMX) t1test
  
  mostlyclean:
! 	-rm -f *.o
  
  maintainer-clean clean:
! 	-rm -f *.o type1.a t1test.exe
  
  distclean:
! 	-rm -f *.o type1.a t1test.exe *~ *.bak Makefile
  
  # Dependencies
  arith.o:    arith.c types.h objects.h spaces.h arith.h
--- 30,42 ----
  	emxbind -b $(EMX) t1test
  
  mostlyclean:
! 	$(RM) -f *.o
  
  maintainer-clean clean:
! 	$(RM) -f *.o type1.a t1test.exe
  
  distclean:
! 	$(RM) -f *.o type1.a t1test.exe *~ *.bak Makefile
  
  # Dependencies
  arith.o:    arith.c types.h objects.h spaces.h arith.h