jeena/moxanix
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Use a prefix when installing executables

Browse source
This commit is contained in:
Igor Socec 2017-01-24 20:40:57 +01:00
parent aa3adfee0c
commit a1162d1674
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -7,6 +7,9 @@ MOXANIX = moxanix
# system install root directory # system install root directory
INSTALL_ROOT = ./install.dir INSTALL_ROOT = ./install.dir
# prefix for /bin directory
BIN_PREFIX = /usr
# ============================================================================== # ==============================================================================
# directories used for local component builds # directories used for local component builds
@ -30,10 +33,10 @@ default:
install: default install: default
mkdir -p $(INSTALL_ROOT) mkdir -p $(INSTALL_ROOT)
cd $(MOXERVER) && make install BUILDDIR=$(BUILDDIR) INSTALLDIR=$(INSTALLDIR) cd $(MOXERVER) && make install BUILDDIR=$(BUILDDIR) INSTALLDIR=$(INSTALLDIR) BIN_PREFIX=$(BIN_PREFIX)
cp -r $(MOXERVER)/$(INSTALLDIR)/* $(INSTALL_ROOT)/ cp -r $(MOXERVER)/$(INSTALLDIR)/* $(INSTALL_ROOT)/
cd $(MOXANIX) && make install BUILDDIR=$(BUILDDIR) INSTALLDIR=$(INSTALLDIR) cd $(MOXANIX) && make install BUILDDIR=$(BUILDDIR) INSTALLDIR=$(INSTALLDIR) BIN_PREFIX=$(BIN_PREFIX)
cp -r $(MOXANIX)/$(INSTALLDIR)/* $(INSTALL_ROOT)/ cp -r $(MOXANIX)/$(INSTALLDIR)/* $(INSTALL_ROOT)/
# clean removes build and install results # clean removes build and install results

6
moxanix/Makefile
View file

@ -8,6 +8,8 @@ TARGET_CONFIG = moxanix.cfg
BUILDDIR = build.dir BUILDDIR = build.dir
# installation root # installation root
INSTALLDIR = install.dir INSTALLDIR = install.dir
# prefix for /bin directory
BIN_PREFIX = /usr
# ============================================================================== # ==============================================================================
@ -20,8 +22,8 @@ default:
# install targets # install targets
install: install:
# install control script # install control script
mkdir -p $(INSTALLDIR)/bin mkdir -p $(INSTALLDIR)/$(BIN_PREFIX)/bin
cp $(TARGET_CONTROL) $(INSTALLDIR)/bin/ cp $(TARGET_CONTROL) $(INSTALLDIR)/$(BIN_PREFIX)/bin/
# install configuration file # install configuration file
mkdir -p $(INSTALLDIR)/etc mkdir -p $(INSTALLDIR)/etc
cp $(TARGET_CONFIG) $(INSTALLDIR)/etc/ cp $(TARGET_CONFIG) $(INSTALLDIR)/etc/

6
moxerver/Makefile
View file

@ -7,6 +7,8 @@ TARGET_BINARY = moxerver
BUILDDIR = build.dir BUILDDIR = build.dir
# installation root # installation root
INSTALLDIR = install.dir INSTALLDIR = install.dir
# prefix for /bin directory
BIN_PREFIX = /usr
# ============================================================================== # ==============================================================================
@ -55,8 +57,8 @@ default: $(BUILDDIR)/$(TARGET_BINARY)
# install target # install target
install: default install: default
mkdir -p $(INSTALLDIR)/bin mkdir -p $(INSTALLDIR)/$(BIN_PREFIX)/bin
cp $(BUILDDIR)/$(TARGET_BINARY) $(INSTALLDIR)/bin/ cp $(BUILDDIR)/$(TARGET_BINARY) $(INSTALLDIR)/$(BIN_PREFIX)/bin
# clean removes object files and target (ignore errors with "-" before commands) # clean removes object files and target (ignore errors with "-" before commands)
clean: clean: