Skip to content

Use environment libdir instead of hardcoded /lib #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nielsenb-jf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use environment libdir instead of hardcoded /lib #76

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ all: src firetools.1 firejail-ui.1
datarootdir=@datarootdir@
PREFIX=@prefix@
prefix=@prefix@
libdir=@libdir@
VERSION=@PACKAGE_VERSION@
NAME=@PACKAGE_NAME@
PACKAGE_TARNAME=@PACKAGE_TARNAME@
DOCDIR=@docdir@


firetools_config_extras.h:
echo "#define PACKAGE_LIBDIR \"$(DESTDIR)/$(PREFIX)/lib/firetools\"" > firetools_config_extras.h
echo "#define PACKAGE_LIBDIR \"$(DESTDIR)/$(libdir)/firetools\"" > firetools_config_extras.h

.PHONY: src
src: firetools_config_extras.h
Expand Down Expand Up @@ -40,16 +41,16 @@ realinstall:
mkdir -p $(DESTDIR)/$(PREFIX)/bin
mkdir -p $(DESTDIR)/$(PREFIX)/share/applications
mkdir -p $(DESTDIR)/$(PREFIX)/share/pixmaps
mkdir -p $(DESTDIR)/$(PREFIX)/lib/firetools
mkdir -p $(DESTDIR)/$(libdir)/firetools
mkdir -p $(DESTDIR)/$(DOCDIR)
mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man1
install -c -m 0755 build/firetools $(DESTDIR)/$(PREFIX)/bin/.
install -c -m 0755 build/firejail-ui $(DESTDIR)/$(PREFIX)/bin/.
install -c -m 0755 build/fmgr $(DESTDIR)/$(PREFIX)/lib/firetools/fmgr
install -c -m 0755 build/fstats $(DESTDIR)/$(PREFIX)/lib/firetools/fstats
install -c -m 0644 src/firetools/uiapps $(DESTDIR)/$(PREFIX)/lib/firetools/.
install -c -m 0644 src/firejail-ui/uimenus $(DESTDIR)/$(PREFIX)/lib/firetools/.
install -c -m 0644 src/firejail-ui/uihelp $(DESTDIR)/$(PREFIX)/lib/firetools/.
install -c -m 0755 build/fmgr $(DESTDIR)/$(libdir)/firetools/fmgr
install -c -m 0755 build/fstats $(DESTDIR)/$(libdir)/firetools/fstats
install -c -m 0644 src/firetools/uiapps $(DESTDIR)/$(libdir)/firetools/.
install -c -m 0644 src/firejail-ui/uimenus $(DESTDIR)/$(libdir)/firetools/.
install -c -m 0644 src/firejail-ui/uihelp $(DESTDIR)/$(libdir)/firetools/.
install -c -m 0644 src/firetools/firetools.desktop $(DESTDIR)/$(PREFIX)/share/applications/.
install -c -m 0644 src/firejail-ui/firejail-ui.desktop $(DESTDIR)/$(PREFIX)/share/applications/.
install -c -m 0644 src/firetools/resources/firetools.png $(DESTDIR)/$(PREFIX)/share/pixmaps/.
Expand Down Expand Up @@ -83,7 +84,7 @@ uninstall:;
rm -fr $(DESTDIR)/$(PREFIX)/share/doc/firetools
rm -fr $(DESTDIR)/$(PREFIX)/share/man/man1/firetools.1*
rm -fr $(DESTDIR)/$(PREFIX)/share/man/man1/firejail-ui.1*
rm -fr $(DESTDIR)/$(PREFIX)/lib/firetools
rm -fr $(DESTDIR)/$(libdir)/firetools

dist:
mv config.status config.status.old
Expand Down