diff -ru FreeDoko-orig/Makefile FreeDoko/Makefile --- FreeDoko-orig/Makefile 2017-06-13 10:46:43.240013128 +0200 +++ FreeDoko/Makefile 2017-06-13 10:51:15.007148812 +0200 @@ -78,8 +78,12 @@ .PHONY: compile compile: # compile FreeDoko - $(MAKE) Version - $(MAKE) -C src/ $(PROGRAM) + $(MAKE) \ + "USE_UI_TEXT=false" \ + "USE_UI_GTKMM=true" \ + "USE_NETWORK=true" \ + "CPPFLAGS+= -DRELEASE -DVERSION_DESCRIPTION='\"$(OPERATING_SYSTEM_NAME) binary\"' -DPUBLIC_DATA_DIRECTORY_VALUE='\"$(DATA_DIRECTORY)\"' -DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"'" \ + -C src/ $(PROGRAM) @echo "---" @echo "* Program 'FreeDoko' created" @@ -280,22 +284,11 @@ ifeq ($(OPERATING_SYSTEM), Linux) .PHONY: install install : - $(MAKE) \ - --always-make \ - "USE_UI_TEXT=false" \ - "USE_UI_GTKMM=true" \ - "USE_NETWORK=true" \ - "CXXFLAGS=-Wall -Werror -Wno-parentheses -pipe -Os -std=c++14" \ - "CPPFLAGS=-DRELEASE -DVERSION_DESCRIPTION='\"$(OPERATING_SYSTEM_NAME) binary\"' -DPUBLIC_DATA_DIRECTORY_VALUE='\"$(DATA_DIRECTORY)\"' -DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"'" \ - -C src \ - $(PROGRAM) - $(MAKE) -C src strip # Copying the program echo "Copying the program" mkdir -p $(DESTDIR)$(BIN_DIRECTORY) cp src/FreeDoko $(DESTDIR)$(BIN_DIRECTORY) - -chgrp games $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko - chmod 750 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko + chmod 755 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko cd $(DESTDIR)$(BIN_DIRECTORY) && ln -sf FreeDoko freedoko # Copying the data files echo "Copying the data files" @@ -312,15 +305,13 @@ a2x -f manpage doc/freedoko.asciidoc mkdir -p $(DESTDIR)$(MAN_DIRECTORY) cp doc/freedoko.6 $(DESTDIR)$(MAN_DIRECTORY)/ - -chgrp games $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6 - chmod 640 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6 + chmod 644 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6 cd $(DESTDIR)$(MAN_DIRECTORY)/ && ln -sf freedoko.6 FreeDoko.6 # copy the icon echo "copy the icon" mkdir -p $(DESTDIR)$(ICON_DIRECTORY) cp src/FreeDoko.png $(DESTDIR)$(ICON_DIRECTORY)/ - -chgrp games $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png - chmod 640 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png + chmod 644 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png .PHONY: uninstall uninstall : diff -ru FreeDoko-orig/Makefile.install.directories FreeDoko/Makefile.install.directories --- FreeDoko-orig/Makefile.install.directories 2017-06-13 10:46:43.240013128 +0200 +++ FreeDoko/Makefile.install.directories 2017-06-13 10:52:04.639959037 +0200 @@ -4,13 +4,13 @@ # the different directories for the files # installing in /usr/local -MAIN_DIRECTORY = /usr/local -BIN_DIRECTORY = $(MAIN_DIRECTORY)/games -DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/games/FreeDoko -HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/FreeDoko -MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 -ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps -DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications +#MAIN_DIRECTORY = /usr/local +#BIN_DIRECTORY = $(MAIN_DIRECTORY)/games +#DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/games/FreeDoko +#HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/FreeDoko +#MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 +#ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps +#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications # debian #MAIN_DIRECTORY = /usr @@ -49,13 +49,13 @@ #DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications # Arch Linux -#MAIN_DIRECTORY = /usr -#BIN_DIRECTORY = $(MAIN_DIRECTORY)/bin -#DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/freedoko -#HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/freedoko -#MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 -#ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps -#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications +MAIN_DIRECTORY = /usr +BIN_DIRECTORY = $(MAIN_DIRECTORY)/bin +DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/freedoko +HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/freedoko +MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6 +ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps +DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications # release diff -ru FreeDoko-orig/bin/FreeDoko.desktop FreeDoko/bin/FreeDoko.desktop --- FreeDoko-orig/bin/FreeDoko.desktop 2017-06-13 10:46:43.240013128 +0200 +++ FreeDoko/bin/FreeDoko.desktop 2017-06-13 10:52:24.906412104 +0200 @@ -6,7 +6,7 @@ Comment=game of Doppelkopf Comment[de]=Doppelkopf-Spiel Comment[fr]=un jeu de Doppelkopf -Exec=/usr/games/freedoko +Exec=/usr/bin/freedoko Path= Icon=FreeDoko Categories=Application;Game;CardGame; diff -ru FreeDoko-orig/data/Makefile FreeDoko/data/Makefile --- FreeDoko-orig/data/Makefile 2017-06-13 10:46:43.870006488 +0200 +++ FreeDoko/data/Makefile 2017-06-13 10:52:51.502798457 +0200 @@ -40,8 +40,7 @@ for d in cardsets iconsets backgrounds sounds; do \ $(MAKE) -C $$d install; \ done - -chgrp games $(DESTDIR)$(DATA_DIRECTORY) && chgrp -R games $(DESTDIR)$(DATA_DIRECTORY) - chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(DATA_DIRECTORY) + chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(DATA_DIRECTORY) endif ifeq ($(SHELLTYPE), sh) diff -ru FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefile --- FreeDoko-orig/doc/Makefile 2017-06-13 10:46:44.733330723 +0200 +++ FreeDoko/doc/Makefile 2017-06-13 10:53:14.319224649 +0200 @@ -34,8 +34,7 @@ fi cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/ for d in de en; do $(MAKE) -C $$d install; done - -chgrp games $(DESTDIR)$(HELP_DIRECTORY) && chgrp -R games $(DESTDIR)$(HELP_DIRECTORY) - chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(HELP_DIRECTORY) + chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(HELP_DIRECTORY) cd $(DESTDIR)$(DATA_DIRECTORY) && ln -sf $(HELP_DIRECTORY)/ doc endif