cw/cw.patch

   1 --- cw-1.0.16/Makefile.in       2007-09-25 11:10:20.000000000 -0600
   2 +++ cw-1.0.16/Makefile.in       2009-12-23 00:22:47.932698402 -0600
   3 @@ -8,7 +8,7 @@ CC=@CC@
   4  ECHO=echo
   5  LN=ln
   6  RM=rm
   7 -MKDIR=mkdir
   8 +MKDIR=mkdir -p
   9  INSTALL=@INSTALL@
  10
  11  all:
  12 @@ -56,32 +56,18 @@ installlocal: cleanlocal local
  13
  14  install: cleanpub cw cwu
  15         @$(ECHO) "* Installing color wrapper..."
  16 -       @for FILE in bin/*;do $(INSTALL) -o 0 -g 0 -m 755 $$FILE $(BINDIR);done
  17 -       @$(LN) -sf $(BINDIR)/cw $(BINDIR)/cwe
  18 +       @for FILE in bin/*;do $(INSTALL) -m 755 $$FILE $(DESTDIR)$(BINDIR);done
  19 +       @$(LN) -sf $(DESTDIR)$(BINDIR)/cw $(DESTDIR)$(BINDIR)/cwe
  20         @$(ECHO) "* Installing color wrapper generic definition files..."
  21 -       @$(MKDIR) -m 755 $(LIBDIR)/cw/
  22 -       @for FILE in def/*;do $(INSTALL) -o 0 -g 0 -m 755 $$FILE $(LIBDIR)/cw/;done
  23 +       @$(MKDIR) -m 755 $(DESTDIR)$(LIBDIR)/cw/
  24 +       @for FILE in def/*;do $(INSTALL) -m 755 $$FILE $(DESTDIR)$(LIBDIR)/cw/;done
  25         @$(ECHO) "* Installing color wrapper generic header/footer files..."
  26 -       @$(MKDIR) -m 755 $(LIBDIR)/cw/etc
  27 -       @for FILE in etc/*;do $(INSTALL) -o 0 -g 0 -m 644 $$FILE $(LIBDIR)/cw/etc;done
  28 +       @$(MKDIR) -m 755 $(DESTDIR)$(LIBDIR)/cw/etc
  29 +       @for FILE in etc/*;do $(INSTALL) -m 644 $$FILE $(DESTDIR)$(LIBDIR)/cw/etc;done
  30         @$(ECHO) "* Installing manual pages..."
  31 -       @for FILE in man/*;do $(INSTALL) -o 0 -g 0 -m 644 $$FILE $(MANDIR)/man1/;done
  32 +       @for FILE in man/*;do $(INSTALL) -m 644 $$FILE $(DESTDIR)$(MANDIR)/man1/;done
  33         @$(ECHO) "* Updating definition files..."
  34 -       @$(BINDIR)/cwu $(LIBDIR)/cw $(BINDIR)/cw
  35 -       @$(ECHO) "-----------------------------------------------------------"
  36 -       @$(ECHO) "* Complete, definitions are stored in: $(LIBDIR)/cw"
  37 -       @$(ECHO) "* For bash: place 'export PATH=\"$(LIBDIR)/cw:\$$PATH\"'"\
  38 -        "at the end of ~/.bash_profile(or /etc/profile globally)"
  39 -       @$(ECHO) "* For tcsh: place 'setenv PATH \"$(LIBDIR)/cw:\$$PATH\"'"\
  40 -        "at the end of ~/.login(or /etc/csh.login globally)"
  41 -       @$(ECHO) "* Or to automate the two lines above use the"\
  42 -        "\"colorcfg\" command. (and add optional anti-coloring precautions)"
  43 -       @$(ECHO) "* Once the desired shell(s) are setup, use the"\
  44 -        "\"color\" command, or the environmental variable NOCOLOR=1 to turn"\
  45 -        "color wrapping on and off."
  46 -       @$(ECHO) ""
  47 -       @$(ECHO) "* PLEASE view the ./README file for more information if"\
  48 -        "you haven't already."
  49 +       @$(DESTDIR)$(BINDIR)/cwu $(DESTDIR)$(LIBDIR)/cw $(DESTDIR)$(BINDIR)/cw
  50
  51  clean:
  52         @$(ECHO) "* Cleaning compiling content..."
  53 @@ -94,9 +80,9 @@ cleanlocal:
  54
  55  cleanpub:
  56         @$(ECHO) "* Cleaning cw and cwu binaries, and definitions..."
  57 -       @$(RM) -rf $(BINDIR)/cw $(BINDIR)/cwu $(BINDIR)/cwe\
  58 -        $(BINDIR)/cw.exe $(BINDIR)/cwu.exe $(BINDIR)/color $(BINDIR)/colorcfg\
  59 -        $(LIBDIR)/cw $(MANDIR)/man1/cw.1.gz $(MANDIR)/man1/cwu.1.gz\
  60 -        $(MANDIR)/man1/cwe.1.gz
  61 +       @$(RM) -rf $(DESTDIR)$(BINDIR)/cw $(DESTDIR)$(BINDIR)/cwu $(DESTDIR)$(BINDIR)/cwe\
  62 +        $(DESTDIR)$(BINDIR)/cw.exe $(DESTDIR)$(BINDIR)/cwu.exe $(DESTDIR)$(BINDIR)/color $(DESTDIR)$(BINDIR)/colorcfg\
  63 +        $(DESTDIR)$(LIBDIR)/cw $(DESTDIR)$(MANDIR)/man1/cw.1.gz $(DESTDIR)$(MANDIR)/man1/cwu.1.gz\
  64 +        $(DESTDIR)$(MANDIR)/man1/cwe.1.gz
  65
  66  cleanall: clean cleanlocal cleanpub
  67
  68 --- cw-1.0.16/bin/colorcfg      2007-09-25 11:10:20.000000000 -0600
  69 +++ cw-1.0.16/bin/colorcfg      2009-12-23 00:29:05.105994275 -0600
  70 @@ -12,7 +12,7 @@ if test -x "${HOME}/.cw/bin/colorcfg";th
  71  else
  72   SED="`which sed 2>/dev/null`"
  73   if test -z "$SED";then
  74 -  CWLIB="/usr/local/lib/cw"
  75 +  CWLIB="/usr/lib/cw"
  76    echo "(NOTE: using static cw library path, this could be invalid)"
  77   else
  78    CWLIB="`echo \"$0/lib/cw\"|sed \"s/\/bin\/colorcfg//g\"`"