cc65/patch-2.13.2.diff

   1 diff -ur cc65-2.13.2-orig//make/gcc.mak cc65-2.13.2-new//make/gcc.mak
   2 --- cc65-2.13.2-orig//make/gcc.mak      2010-04-06 21:05:59.659188896 +0200
   3 +++ cc65-2.13.2-new//make/gcc.mak       2010-04-06 21:26:31.323885004 +0200
   4 @@ -15,7 +15,8 @@
   5  # (That trick has been disabled.)
   6
   7  # The install prefix and directories
   8 -prefix         = /usr/local
   9 +D=$(DEST_DIR)
  10 +prefix         = /usr
  11  exec_prefix    = $(prefix)
  12
  13  bindir         = $(exec_prefix)/bin
  14 @@ -34,7 +35,7 @@
  15
  16  # Programs
  17
  18 -MKDIR          = mkdir -m 755
  19 +MKDIR          = mkdir -m 755 -p
  20
  21  # BSD-like install-script/-program
  22  INSTALL                = make/install-sh
  23 @@ -119,76 +120,76 @@
  24           fi 2>/dev/null
  25
  26  .PHONY:        install-dirs
  27 -install-dirs:  $(bindir) $(datadir) $(docdir) $(libdir) \
  28 -               $(CC65_DOC) $(CC65_HOME) \
  29 -               $(CA65_INC) $(CC65_INC) \
  30 -               $(CC65_INC)/em $(CC65_INC)/geos $(CC65_INC)/joystick \
  31 -               $(CC65_INC)/mouse $(CC65_INC)/sys $(CC65_INC)/tgi \
  32 -               $(LD65_CFG) $(LD65_LIB) $(LD65_OBJ) \
  33 -               $(CC65_HOME)/emd $(CC65_HOME)/joy $(CC65_HOME)/mou \
  34 -               $(CC65_HOME)/ser $(CC65_HOME)/tgi
  35 -
  36 -$(bindir) $(datadir) $(docdir) $(libdir) \
  37 -$(CC65_DOC) $(CC65_HOME) \
  38 -$(CA65_INC) $(CC65_INC) \
  39 -$(LD65_CFG) $(LD65_LIB) $(LD65_OBJ):
  40 +install-dirs:  $(D)/$(bindir) $(D)/$(datadir) $(D)/$(docdir) $(D)/$(libdir) \
  41 +               $(D)/$(CC65_DOC) $(D)/$(CC65_HOME) \
  42 +               $(D)/$(CA65_INC) $(D)/$(CC65_INC) \
  43 +               $(D)/$(CC65_INC)/em $(D)/$(CC65_INC)/geos $(D)/$(CC65_INC)/joystick \
  44 +               $(D)/$(CC65_INC)/mouse $(D)/$(CC65_INC)/sys $(D)/$(CC65_INC)/tgi \
  45 +               $(D)/$(LD65_CFG) $(D)/$(LD65_LIB) $(D)/$(LD65_OBJ) \
  46 +               $(D)/$(CC65_HOME)/emd $(D)/$(CC65_HOME)/joy $(D)/$(CC65_HOME)/mou \
  47 +               $(D)/$(CC65_HOME)/ser $(D)/$(CC65_HOME)/tgi
  48 +
  49 +$(D)/$(bindir) $(D)/$(datadir) $(D)/$(docdir) $(D)/$(libdir) \
  50 +$(D)/$(CC65_DOC) $(D)/$(CC65_HOME) \
  51 +$(D)/$(CA65_INC) $(D)/$(CC65_INC) \
  52 +$(D)/$(LD65_CFG) $(D)/$(LD65_LIB) $(D)/$(LD65_OBJ):
  53         $(MKDIR) $@
  54
  55 -$(CC65_HOME)/% $(CC65_INC)/% $(CC65_DOC)/%:
  56 +$(D)/$(CC65_HOME)/% $(D)/$(CC65_INC)/% $(D)/$(CC65_DOC)/%:
  57         $(MKDIR) $@
  58
  59  install-bins:
  60         for f in ar65 ca65 cc65 cl65 co65 da65 ld65 od65 grc; \
  61 -         do $(INSTALL_STRIP) src/$$f/$$f${EXT} $(bindir) || exit $$?; \
  62 +         do $(INSTALL_STRIP) src/$$f/$$f${EXT} $(D)/$(bindir) || exit $$?; \
  63           done
  64 -       $(INSTALL_PROG) src/ca65html/ca65html $(bindir)
  65 +       $(INSTALL_PROG) src/ca65html/ca65html $(D)/$(bindir)
  66
  67  install-libs:
  68         for f in asminc/*.inc; \
  69 -         do $(INSTALL_DATA) $$f $(CA65_INC) || exit $$?; \
  70 +         do $(INSTALL_DATA) $$f $(D)/$(CA65_INC) || exit $$?; \
  71           done
  72         for f in include/*.h; \
  73 -         do $(INSTALL_DATA) $$f $(CC65_INC) || exit $$?; \
  74 +         do $(INSTALL_DATA) $$f $(D)/$(CC65_INC) || exit $$?; \
  75           done
  76         for d in em geos joystick mouse sys tgi; \
  77           do for f in include/$$d/*.h; \
  78 -           do $(INSTALL_DATA) $$f $(CC65_INC)/$$d || exit $$?; \
  79 +           do $(INSTALL_DATA) $$f $(D)/$(CC65_INC)/$$d || exit $$?; \
  80             done || exit $$?; \
  81           done
  82         for f in libsrc/*.lib; \
  83 -         do $(INSTALL_DATA) $$f $(LD65_LIB) || exit $$?; \
  84 +         do $(INSTALL_DATA) $$f $(D)/$(LD65_LIB) || exit $$?; \
  85           done
  86         for f in libsrc/*-*.o; \
  87 -         do $(INSTALL_DATA) $$f $(LD65_OBJ) || exit $$?; \
  88 +         do $(INSTALL_DATA) $$f $(D)/$(LD65_OBJ) || exit $$?; \
  89           done
  90         for d in emd joy mou ser tgi; \
  91           do for f in libsrc/*.$$d; \
  92 -           do $(INSTALL_DATA) $$f $(CC65_HOME)/$$d || exit $$?; \
  93 +           do $(INSTALL_DATA) $$f $(D)/$(CC65_HOME)/$$d || exit $$?; \
  94             done || exit $$?; \
  95           done
  96         for f in src/ld65/cfg/*-*.cfg; \
  97 -         do $(INSTALL_DATA) $$f $(LD65_CFG) || exit $$?; \
  98 +         do $(INSTALL_DATA) $$f $(D)/$(LD65_CFG) || exit $$?; \
  99           done
 100
 101  install-docs:
 102         for f in src/ca65/macpack/*.mac; \
 103 -         do $(INSTALL_DATA) $$f $(CC65_DOC) || exit $$?; \
 104 +         do $(INSTALL_DATA) $$f $(D)/$(CC65_DOC) || exit $$?; \
 105           done
 106         for f in readme.1st compile.txt CREDITS BUGS internal.txt newvers.txt; \
 107 -         do $(INSTALL_DATA) doc/$$f $(CC65_DOC) || exit $$?; \
 108 +         do $(INSTALL_DATA) doc/$$f $(D)/$(CC65_DOC) || exit $$?; \
 109           done
 110         if [ -f doc/index.htm* ]; \
 111           then for f in doc/*.htm*; \
 112 -           do $(INSTALL_DATA) $$f $(CC65_DOC) || exit $$?; \
 113 +           do $(INSTALL_DATA) $$f $(D)/$(CC65_DOC) || exit $$?; \
 114             done; \
 115           fi
 116
 117 -install-samps: ${addprefix $(CC65_DOC)/, $(shell find samples -type d)}
 118 +install-samps: ${addprefix $(D)/$(CC65_DOC)/, $(shell find samples -type d)}
 119         @$(MAKE) -C samples zap
 120         for d in `find samples -type d`; \
 121           do for f in $$d/*; \
 122             do if [ -f $$f ]; \
 123 -             then $(INSTALL_DATA) $$f $(CC65_DOC)/$$d || exit $$?; \
 124 +             then $(INSTALL_DATA) $$f $(D)/$(CC65_DOC)/$$d || exit $$?; \
 125               fi; \
 126             done || exit $$?; \
 127           done