Skip to content
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.

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

bugfix: checkinstall fails & dwm-msg not removed on uninstall #381

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
22 changes: 12 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,26 +46,28 @@ dist: clean
rm -rf dwm-${VERSION}

install: all
mkdir -p ${DESTDIR}${PREFIX}/bin
cp -f dwm ${DESTDIR}${PREFIX}/bin
#mkdir -p ${DESTDIR}${PREFIX}/bin
install -C -D -m 0755 dwm ${DESTDIR}${PREFIX}/bin/dwm
ifdef YAJLLIBS
cp -f dwm-msg ${DESTDIR}${PREFIX}/bin
install -C -D -m 0755 dwm-msg ${DESTDIR}${PREFIX}/bin/dwm-msg
endif
#cp -f patch/dwmc ${DESTDIR}${PREFIX}/bin
chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
#chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
ifdef YAJLLIBS
chmod 755 ${DESTDIR}${PREFIX}/bin/dwm-msg
#chmod 755 ${DESTDIR}${PREFIX}/bin/dwm-msg
endif
mkdir -p ${DESTDIR}${MANPREFIX}/man1
#mkdir -p ${DESTDIR}${MANPREFIX}/man1
install -C -m 0755 dwm.1 -D ${DESTDIR}${MANPREFIX}/man1/dwm.1
sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
mkdir -p ${DESTDIR}${PREFIX}/share/xsessions
test -f ${DESTDIR}${PREFIX}/share/xsessions/dwm.desktop || cp -n dwm.desktop ${DESTDIR}${PREFIX}/share/xsessions
chmod 644 ${DESTDIR}${PREFIX}/share/xsessions/dwm.desktop
#mkdir -p ${DESTDIR}${PREFIX}/share/xsessions
install -C -D -m 0644 dwm.desktop ${DESTDIR}${PREFIX}/share/xsessions/dwm.desktop

uninstall:
rm -f ${DESTDIR}${PREFIX}/bin/dwm\
${DESTDIR}${MANPREFIX}/man1/dwm.1\
${DESTDIR}${PREFIX}/share/xsessions/dwm.desktop
ifdef YAJLLIBS
rm -f ${DESTDIR}${PREFIX}/bin/dwm-msg
endif

.PHONY: all clean dist install uninstall