Permalink
Browse files

-Change: Install opendune png icon

  • Loading branch information...
1 parent 1b51e7a commit b59fc9973dc36500d87229a2f415225f64557627 @miniupnp miniupnp committed Jun 9, 2016
Showing with 18 additions and 0 deletions.
  1. +9 −0 Makefile.bundle.in
  2. +1 −0 Makefile.in
  3. +8 −0 config.lib
View
@@ -39,6 +39,9 @@ endif
$(Q)cp "$(ROOT_DIR)/COPYING" "$(BUNDLE_DIR)/"
$(Q)cp "$(ROOT_DIR)/enhancement.txt" "$(BUNDLE_DIR)/"
$(Q)cp "$(BIN_DIR)/opendune.ini.sample" "$(BUNDLE_DIR)/"
+ifeq ($(OS), UNIX)
+ $(Q)cp "$(ROOT_DIR)/os/png_icon/opendune_32x32.png" "$(BUNDLE_DIR)/$(BINARY_NAME).png"
+endif
ifeq ($(OPENDUNE), opendune.exe)
$(Q)unix2dos "$(BUNDLE_DIR)/README.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/enhancement.txt"
$(Q)unix2dos "$(BUNDLE_DIR)/opendune.ini.sample"
@@ -136,4 +139,10 @@ ifndef DO_NOT_INSTALL_LICENSE
$(Q)install -d "$(INSTALL_DOC_DIR)"
$(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)"
endif
+ifndef DO_NOT_INSTALL_ICON
+ifeq ($(OS), UNIX)
+ $(Q)install -d "$(INSTALL_ICON_DIR)"
+ $(Q)install -m 644 "$(BUNDLE_DIR)/$(BINARY_NAME).png" "$(INSTALL_ICON_DIR)"
+endif
+endif
endif # OSXAPP
View
@@ -18,6 +18,7 @@ INSTALL_DIR = !!INSTALL_DIR!!
INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
+INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
SOURCE_LIST = !!SOURCE_LIST!!
CONFIGURE_FILES = !!CONFIGURE_FILES!!
BINARY_NAME = !!BINARY_NAME!!
View
@@ -27,6 +27,7 @@ set_default() {
binary_dir="games"
doc_dir="share/doc/opendune"
data_dir="share/games/opendune"
+ icon_dir="share/icons/hicolor/32x32/apps"
install_dir="/"
binary_name="opendune"
enable_debug="0"
@@ -61,6 +62,7 @@ set_default() {
prefix_dir
binary_dir
data_dir
+ icon_dir
install_dir
binary_name
enable_debug
@@ -135,6 +137,9 @@ detect_params() {
--data-dir) prev_p="data_dir";;
--data-dir=*) data_dir="$optarg";;
+ --icon-dir) prev_p="icon_dir";;
+ --icon-dir=*) icon_dir="$optarg";;
+
--binary-name) prev_p="binary_name";;
--binary-name=*) binary_name="$optarg";;
@@ -1771,6 +1776,7 @@ make_sed() {
s@!!BINARY_DIR!!@$prefix_dir/$binary_dir@g;
s@!!DOC_DIR!!@$prefix_dir/$doc_dir@g;
s@!!DATA_DIR!!@$prefix_dir/$data_dir@g;
+ s@!!ICON_DIR!!@$prefix_dir/$icon_dir@g;
s@!!INSTALL_DIR!!@$install_dir@g;
s@!!BINARY_NAME!!@$binary_name@g;
s@!!DEPEND!!@$DEPEND@g;
@@ -1950,6 +1956,8 @@ showhelp() {
echo " --data-dir=dir location of data files (.PAK files)."
echo " Will be prefixed with the prefix-dir"
echo " [share/games/opendune]"
+ echo " --icon-dir=dir location of icon files."
+ echo " Will be prefixed with the prefix-dir"
echo " --install-dir=dir specifies the root to install to."
echo " Useful to install into jails [/]"
echo " --binary-name the name used for the binary, icons,"

0 comments on commit b59fc99

Please sign in to comment.