wavplay-make+res.patch

   1 diff -Naur wavplay-1.4/Makefile wavplay-1.4-p/Makefile
   2 --- wavplay-1.4/Makefile        Sat Dec  4 01:06:42 1999
   3 +++ wavplay-1.4-p/Makefile      Tue May 30 23:16:01 2000
   4 @@ -38,7 +38,7 @@
   5  #----------------------------------------------------------------------
   6  # If you are running a 386 you should comment this line out.
   7  #
   8 -CPU=-m486
   9 +#CPU=-m486
  10
  11  #----------------------------------------------------------------------
  12  # If you are experiencing troubles (like core dumps!), then uncomment
  13 @@ -47,7 +47,7 @@
  14  # adjust the STRIP option to suit compile mode:
  15  #
  16  #DEBUG=-g
  17 -OPT=-O2
  18 +#OPT=-O2
  19
  20  #----------------------------------------------------------------------
  21  # When using 'DEBUG=-g' above, then comment out the 'strip' line:
  22 @@ -60,6 +60,7 @@
  23  # placed (wavplay, wavrec, and xltwavplay)
  24  #
  25  INSTDIR=/usr/local/bin
  26 +XINSTDIR=/usr/bin
  27
  28  #----------------------------------------------------------------------
  29  # Uncomment this line if you want to install the xltwavplay.res resource
  30 @@ -67,7 +68,7 @@
  31  # builtin fallback resources in the program itself. If you don't know
  32  # what this is all about, then leave the next line commented out.
  33  #
  34 -#USERES=-DINSTALLED_RESOURCE_FILE
  35 +USERES=-DINSTALLED_RESOURCE_FILE
  36
  37  #----------------------------------------------------------------------
  38  # If the resource file is to be installed, indicate where. If the above
  39 @@ -163,7 +164,7 @@
  40  # this should be unecessary if the appropriate symlinks are
  41  # installed).
  42  #
  43 -#CUSTINCL= -I/usr/X11R6/include/X11 -I/usr/local/lesstif/include/Xm
  44 +#CUSTINCL= -I/usr/include/X11
  45
  46  #----------------------------------------------------------------------
  47  # Normally, you shouldn't need to change anything beyond this point:
  48 @@ -202,7 +203,7 @@
  49
  50  wavrec:        wavplay
  51         rm -f wavrec
  52 -       ln wavplay wavrec
  53 +       ln -s wavplay wavrec
  54
  55  xltwavplay: $(CLNOBJ) xltwavplay.o
  56         $(CC) $(CLNOBJ) $(XLDOPTS) $(DEBUG) -o xltwavplay
  57 @@ -215,9 +216,9 @@
  58
  59  install_wavplay: wavplay wavrec
  60         @[ ! -d "$(INSTDIR)" ] && echo "You do not have a directory $(INSTDIR); Check INSTDIR in make file." && exit 13 || :
  61 -       $(INSTALL) -o root -g root -m 555 wavplay $(INSTDIR)
  62 +       $(INSTALL) wavplay $(INSTDIR)
  63         rm -f $(INSTDIR)/wavrec
  64 -       ln $(INSTDIR)/wavplay $(INSTDIR)/wavrec
  65 +       ln -s wavplay $(INSTDIR)/wavrec
  66         @[ ! -z "$(SCHED_PRIORITY)" ] && echo "*** DO 'make setuid_root' IF YOU WANT REAL TIME SCHEDULING ***" || :
  67         @echo
  68
  69 @@ -234,11 +235,9 @@
  70         @echo
  71
  72  install_xltwavplay: xltwavplay
  73 -       $(INSTALL) -o root -g root -m 555 xltwavplay $(INSTDIR)
  74 +       $(INSTALL) xltwavplay $(XINSTDIR)
  75         @[ ! -z "$(USERES)" ] \
  76 -               && $(INSTALL) -o root -g root -m 555 xltwavplay.res $(RESDIR)/xltwavplay \
  77 -               && ls -dlL $(RESDIR)/xltwavplay/xltwavplay.res \
  78 -               || rm -f $(RESDIR)/xltwavplay
  79 +               && $(INSTALL) xltwavplay.res $(RESDIR)/xltwavplay
  80
  81  clean:
  82         rm -f *.o a.out core t.t errs.t
  83 diff -Naur wavplay-1.4/xltwavplay.res wavplay-1.4-p/xltwavplay.res
  84 --- wavplay-1.4/xltwavplay.res  Sat Dec  4 01:06:42 1999
  85 +++ wavplay-1.4-p/xltwavplay.res        Tue May 30 23:18:57 2000
  86 @@ -31,17 +31,17 @@
  87  xltwavplay*TimeLbl0.labelString: Duration:
  88  xltwavplay*FileLbl1.labelString: \
  89  xltwavplay*FileLbl1.foreground: black
  90 -xltwavplay*TypeLbl1.labelString:
  91 +xltwavplay*TypeLbl1.labelString: \
  92  xltwavplay*TypeLbl1.foreground: black
  93 -xltwavplay*DateLbl1.labelString:
  94 +xltwavplay*DateLbl1.labelString: \
  95  xltwavplay*DateLbl1.foreground: black
  96 -xltwavplay*SizeLbl1.labelString:
  97 +xltwavplay*SizeLbl1.labelString: \
  98  xltwavplay*SizeLbl1.foreground: black
  99  xltwavplay*SamplingRateLbl1.labelString:
 100  xltwavplay*SamplingRateLbl1.foreground: black
 101 -xltwavplay*SamplesLbl1.labelString:
 102 +xltwavplay*SamplesLbl1.labelString: \
 103  xltwavplay*SamplesLbl1.foreground: black
 104 -xltwavplay*TimeLbl1.labelString:
 105 +xltwavplay*TimeLbl1.labelString: \
 106  xltwavplay*TimeLbl1.foreground: black
 107  xltwavplay*Play.labelString: Play
 108  xltwavplay*StopPlay.labelString: Stop