update Makefile (moved install commands to utils script)

pull/568/head
Dustin Falgout 2016-09-18 05:50:46 -05:00
parent 62b93afbec
commit a8205bada6
2 changed files with 35 additions and 21 deletions

View File

@ -1,10 +1,10 @@
SASS=scss SASS=scss
SASSFLAGS=--sourcemap=none SASSFLAGS=--sourcemap=none
GLIB_COMPILE_RESOURCES=glib-compile-resources GLIB_COMPILE_RESOURCES=glib-compile-resources
RES_DIR=gtk-3.0 RES_DIR=src/gtk-3.0
SCSS_DIR=$(RES_DIR)/scss SCSS_DIR=$(RES_DIR)/scss
DIST_DIR=$(RES_DIR)/dist DIST_DIR=$(RES_DIR)/dist
RES_DIR320=gtk-3.20 RES_DIR320=src/gtk-3.20
SCSS_DIR320=$(RES_DIR320)/scss SCSS_DIR320=$(RES_DIR320)/scss
DIST_DIR320=$(RES_DIR320)/dist DIST_DIR320=$(RES_DIR320)/dist
INSTALL_DIR=$(DESTDIR)/usr/share/themes/Numix INSTALL_DIR=$(DESTDIR)/usr/share/themes/Numix
@ -33,25 +33,7 @@ clean:
rm -f $(RES_DIR320)/gtk.gresource rm -f $(RES_DIR320)/gtk.gresource
install: all install: all
install -d -m755 $(INSTALL_DIR) $(UTILS) install $(INSTALL_DIR)
mkdir -p $(INSTALL_DIR)/gtk-3.0
mkdir -p $(INSTALL_DIR)/gtk-3.20
cp -pr gtk-2.0 $(INSTALL_DIR)
cp -p gtk-3.0/gtk.css $(INSTALL_DIR)/gtk-3.0
cp -p gtk-3.0/gtk-dark.css $(INSTALL_DIR)/gtk-3.0
cp -p gtk-3.0/gtk.gresource $(INSTALL_DIR)/gtk-3.0
cp -p gtk-3.0/thumbnail.png $(INSTALL_DIR)/gtk-3.0
cp -p gtk-3.20/gtk.css $(INSTALL_DIR)/gtk-3.20
cp -p gtk-3.20/gtk-dark.css $(INSTALL_DIR)/gtk-3.20
cp -p gtk-3.20/gtk.gresource $(INSTALL_DIR)/gtk-3.20
cp -p gtk-3.20/thumbnail.png $(INSTALL_DIR)/gtk-3.20
cp -pr metacity-1 $(INSTALL_DIR)
cp -pr openbox-3 $(INSTALL_DIR)
cp -pr xfce-notify-4.0 $(INSTALL_DIR)
cp -pr xfwm4 $(INSTALL_DIR)
cp -pr unity $(INSTALL_DIR)
cp -p index.theme $(INSTALL_DIR)
uninstall: uninstall:
rm -rf $(INSTALL_DIR) rm -rf $(INSTALL_DIR)

View File

@ -1,5 +1,32 @@
#!/bin/bash #!/bin/bash
do_install() {
local GTKDIR GTK320DIR GTKVER INSTALL_DIR
INSTALL_DIR="$1"
GTKDIR="${INSTALL_DIR}/gtk-3.0"
GTK320DIR="${INSTALL_DIR}/gtk-3.20"
install -dm755 "${INSTALL_DIR}"
for _DIR in "${GTKDIR}" "${GTK320DIR}"
do
GTKVER="${_DIR##*/}"
mkdir -p "${_DIR}"
cp -rT "${INSTALL_DIR}" \
gtk-2.0 metacity-1 openbox-3 xfce-notify-4.0 xfwm4 unity
cp -T "${_DIR}" \
"${GTKVER}/gtk.css" \
"${GTKVER}/gtk-dark.css" \
"${GTKVER}/gtk.gresource" \
"${GTKVER}/thumbnail.png" \
"${GTKVER}/index.theme"
done
}
update_changes_file() { update_changes_file() {
local LATEST_STABLE_RELEASE local LATEST_STABLE_RELEASE
LATEST_STABLE_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1)) LATEST_STABLE_RELEASE=$(git describe --tags $(git rev-list --tags --max-count=1))
@ -18,12 +45,17 @@ update_changes_file() {
} }
case $1 in case $1 in
changes) changes)
update_changes_file update_changes_file
exit $? exit $?
;; ;;
install)
do_install "$2"
;;
*) *)
exit 0 exit 0
;; ;;