Merge pull request #468 from pmjdebruijn/samples

make changes
This commit is contained in:
Oliver Schmidt 2017-07-23 02:09:20 +02:00 committed by GitHub
commit 5d333239c6
4 changed files with 10 additions and 10 deletions

View file

@ -6,8 +6,8 @@ endif
.SUFFIXES: .SUFFIXES:
htmldir = $(prefix)/share/doc/cc65$(DESTPACKAGE_SUFFIX)/html htmldir = $(PREFIX)/share/doc/cc65$(DESTPACKAGE_SUFFIX)/html
infodir = $(prefix)/share/info infodir = $(PREFIX)/share/info
ifdef CMD_EXE ifdef CMD_EXE
@ -46,7 +46,7 @@ clean:
$(RM) -r ../html ../info $(RM) -r ../html ../info
install: install:
$(if $(prefix),,$(error variable `prefix' must be set)) $(if $(PREFIX),,$(error variable `PREFIX' must be set))
ifeq ($(wildcard ../html),../html) ifeq ($(wildcard ../html),../html)
$(INSTALL) -d $(DESTDIR)$(htmldir) $(INSTALL) -d $(DESTDIR)$(htmldir)
$(INSTALL) -m0644 ../html/*.* $(DESTDIR)$(htmldir) $(INSTALL) -m0644 ../html/*.* $(DESTDIR)$(htmldir)

View file

@ -72,7 +72,7 @@ endif
ifndef TARGET ifndef TARGET
datadir = $(prefix)/share/cc65 datadir = $(PREFIX)/share/cc65
all lib: $(TARGETS) all lib: $(TARGETS)
@ -92,7 +92,7 @@ INSTALL = install
define INSTALL_recipe define INSTALL_recipe
$(if $(prefix),,$(error variable `prefix' must be set)) $(if $(PREFIX),,$(error variable `PREFIX' must be set))
$(INSTALL) -d $(DESTDIR)$(datadir)/$(dir) $(INSTALL) -d $(DESTDIR)$(datadir)/$(dir)
$(INSTALL) -m0644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir) $(INSTALL) -m0644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir)

View file

@ -237,10 +237,10 @@ samples.atr: samples
# Installation rules # Installation rules
INSTALL = install INSTALL = install
samplesdir = $(prefix)/share/cc65 samplesdir = $(PREFIX)/share/cc65/samples
install: install:
$(if $(prefix),,$(error variable `prefix' must be set)) $(if $(PREFIX),,$(error variable `PREFIX' must be set))
$(INSTALL) -d $(DESTDIR)$(samplesdir) $(INSTALL) -d $(DESTDIR)$(samplesdir)
$(INSTALL) -d $(DESTDIR)$(samplesdir)/geos $(INSTALL) -d $(DESTDIR)$(samplesdir)/geos
$(INSTALL) -d $(DESTDIR)$(samplesdir)/tutorial $(INSTALL) -d $(DESTDIR)$(samplesdir)/tutorial

View file

@ -19,8 +19,8 @@ PROGS = ar65 \
.SUFFIXES: .SUFFIXES:
bindir := $(prefix)/bin bindir := $(PREFIX)/bin
datadir := $(if $(prefix),$(prefix)/share/cc65,$(abspath ..)) datadir := $(if $(PREFIX),$(PREFIX)/share/cc65,$(abspath ..))
CA65_INC = $(datadir)/asminc CA65_INC = $(datadir)/asminc
CC65_INC = $(datadir)/include CC65_INC = $(datadir)/include
@ -107,7 +107,7 @@ $(RM) /usr/local/bin/$(prog)
endef # UNAVAIL_recipe endef # UNAVAIL_recipe
install: install:
$(if $(prefix),,$(error variable `prefix' must be set)) $(if $(PREFIX),,$(error variable `PREFIX' must be set))
$(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(bindir)
$(INSTALL) ../bin/* $(DESTDIR)$(bindir) $(INSTALL) ../bin/* $(DESTDIR)$(bindir)