Update makefile and don't print list of layouts as it is not really

necessary
This commit is contained in:
speediegq 2022-10-08 23:15:17 +02:00
parent 3c19c2429c
commit 9b31acfa7d
2 changed files with 6 additions and 9 deletions

View file

@ -20,7 +20,7 @@ options:
@echo "CFLAGS = [${CFLAGS}]"
@echo "LDFLAGS = [${LDFLAGS}]"
@echo "CC = [${CC}]"
@echo ===========================================
@echo
.c.o:
${CC} -c ${CFLAGS} $<
@ -51,8 +51,6 @@ install: all
@echo "CFLAGS = [${CFLAGS}]"
@echo "LDFLAGS = [${LDFLAGS}]"
@echo "CC = [${CC}]"
@echo ===========================================
touch drw.o speedwm.o util.o
mkdir -p ${DESTDIR}${PREFIX}/bin
mkdir -p ${DESTDIR}${PREFIX}/share/speedwm
[ -f speedwm-msg ] && cp -f speedwm speedwm-msg ${DESTDIR}${PREFIX}/bin || :
@ -69,23 +67,22 @@ install: all
[ -f docs/colors.def.h ] || cp -f colors.h docs/colors.def.h || :
[ -f docs/statusbar.def.h ] || cp -f statusbar.h docs/statusbar.def.h || :
[ -f docs/status.def ] || cp -f status docs/status.def || :
[ -f speedwm-msg ] && chmod 755 ${DESTDIR}${PREFIX}/bin/speedwm-msg || :
[ -f speedwm.png ] && cp -f speedwm.png ${DESTDIR}${PREFIX}/share/pixmaps/speedwm.png || :
cp -f docs/keybinds ${DESTDIR}${PREFIX}/share/speedwm/keybinds
cp -f docs/dependencies ${DESTDIR}${PREFIX}/share/speedwm/dependencies
cp -f docs/doc-* ${DESTDIR}${PREFIX}/share/speedwm/
cp -f docs/example.* ${DESTDIR}${PREFIX}/share/speedwm/
cp -f scripts/speedwm* ${DESTDIR}${PREFIX}/bin ; chmod +x ${DESTDIR}${PREFIX}/bin/speedwm*
cp -f status ${DESTDIR}${PREFIX}/bin ; chmod +x ${DESTDIR}${PREFIX}/bin/status
echo "${DESTDIR}${PREFIX}/bin/" > ${DESTDIR}${PREFIX}/share/speedwm/bindir
chmod +x ./scripts/speedwm-compatcheck
chmod +x ./scripts/speedwm-dm
chmod 755 ${DESTDIR}${PREFIX}/bin/speedwm
[ -f speedwm-msg ] && chmod 755 ${DESTDIR}${PREFIX}/bin/speedwm-msg || :
mkdir -p /usr/share
echo "${DESTDIR}${PREFIX}/bin/" > /usr/share/speedwm/bindir
./scripts/speedwm-compatcheck
./scripts/speedwm-dm
[ -f speedwm.png ] && cp -f speedwm.png ${DESTDIR}${PREFIX}/share/pixmaps/speedwm.png || :
make modules_install
rm -f drw.o speedwm.o util.o speedwm speedwm-msg ; echo "Installed speedwm to ${DESTDIR}${PREFIX}/bin"
[ -f ${DESTDIR}${PREFIX}/bin/speedwm ] && rm -f drw.o speedwm.o util.o speedwm speedwm-msg || :
modules_install:
cp -f modules/module_* ${DESTDIR}${PREFIX}/bin

View file

@ -130,7 +130,7 @@ fi
AVAILABLE_LAYOUTS="$(printf "$AVAILABLE_LAYOUTS" | sed "s/ /, /g")"
printf "Available layouts: $AVAILABLE_LAYOUTS\n"
#printf "Available layouts: $AVAILABLE_LAYOUTS\n"
# Copy .Xresources file
cp docs/example.Xresources /usr/share/speedwm/example.Xresources