Browse Source

Replace mkdir with install -d

master v1.5
Nils 4 years ago
parent
commit
0dc483709c
  1. 13
      template/Makefile.in

13
template/Makefile.in

@ -17,12 +17,12 @@ all: | calfbox
calfbox:
mkdir -p site-packages
#First build the shared lib. Instead of running make install we create the lib ourselves directly
cd template/calfbox && echo $(shell pwd)
cd template/calfbox && echo $(shell pwd)
#cd template/calfbox && make && make install DESTDIR=$(shell pwd)/../../site-packages
cd template/calfbox && make
cd template/calfbox && make
cp template/calfbox/.libs/libcalfbox.so.0.0.0 site-packages/"lib$(PROGRAM).so.$(VERSION)"
#We need to be in the directory, make uses subshells which will forget the work-dir in the next line. So here is a trick:
#cd template/calfbox && python3 setup.py build && python3 setup.py install --user --install-lib ../../site-packages
#cd template/calfbox && python3 setup.py build && python3 setup.py install --user --install-lib ../../site-packages
#The line above is too much for our specialized use-case. We just copy the few files we need manually.
mkdir -p site-packages/calfbox
cp template/calfbox/py/cbox.py site-packages/calfbox
@ -48,7 +48,7 @@ gitclean:
resources:
cd template/documentation && python3 build.py
cd documentation && sh build-documentation.sh
cd qtgui/resources && sh buildresources.sh
cd qtgui/resources && sh buildresources.sh
install:
install -D -m 755 $(PROGRAM).bin $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
@ -59,6 +59,7 @@ install:
install -D -m 644 desktop/desktop.desktop $(DESTDIR)$(PREFIX)/share/applications/$(PROGRAM).desktop
install -d $(DESTDIR)$(PREFIX)/share/man/man1
gzip -c documentation/$(PROGRAM).1 > $(DESTDIR)$(PREFIX)/share/man/man1/$(PROGRAM).1.gz
@ -70,10 +71,10 @@ install:
install -D -m 755 site-packages/lib$(PROGRAM).so.$(VERSION) -t $(DESTDIR)$(PREFIX)/lib/$(PROGRAM)
mkdir -p $(DESTDIR)$(PREFIX)/share/$(PROGRAM)/
install -d $(DESTDIR)$(PREFIX)/share/$(PROGRAM)
cp -r engine/resources/* $(DESTDIR)$(PREFIX)/share/$(PROGRAM)/
install -D -m 644 template/engine/resources/metronome/* -t $(DESTDIR)$(PREFIX)/share/$(PROGRAM)/template/metronome
uninstall:
#Directories
rm -rf $(DESTDIR)$(PREFIX)/share/template/$(PROGRAM)

Loading…
Cancel
Save