Skip to content

Commit 7899d86

Browse files
committed
adjusting Makefile, install files, and directories. Removing lowres screenshots.
1 parent 6946d98 commit 7899d86

9 files changed

+13
-16
lines changed

Diff for: Makefile

+11-14
Original file line numberDiff line numberDiff line change
@@ -2947,27 +2947,24 @@ $(B)/$(SERVERBINSH):
29472947
@echo 'cd $(COPYBINDIR)' >> $@
29482948
@echo './$(SERVERBIN) "$$@"' >> $@
29492949

2950+
# Install the .desktop, icon files, license, etc.
29502951
install: release
29512952
ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
29522953
$(echo_cmd) "Installing for Linux platform in $(COPYBINDIR) and $(PREFIX)"
2953-
@$(MKDIR) -p $(COPYBINDIR)
2954+
@$(INSTALL) -d $(PREFIX)/bin "$(PREFIX)/share/metainfo/" \
2955+
"$(PREFIX)/share/licenses/$(PACKAGE)/" "$(PREFIX)/share/applications/" \
2956+
"$(PREFIX)/share/icons/hicolor/128x128/apps" "$(COPYBINDIR)"
29542957
@cd $(BR) && for file in $(NAKED_TARGETS); do \
29552958
$(INSTALL) -D $$file $(COPYBINDIR)/$$file; \
29562959
done
2957-
# @(cd $(BR) && $(INSTALL) $() $(COPYBINDIR) )
2958-
# TODO: create these .sh files:
2959-
@$(INSTALL) -d $(PREFIX)/bin
2960-
@$(INSTALL) -D -m755 $(BR)/$(CLIENTBINSH) $(BR)/$(SERVERBINSH) $(PREFIX)/bin
2961-
# Install the .desktop, icon files, license, etc.
2962-
@$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.png" "$(PREFIX)/share/pixmaps/tremulous.png"
2963-
@$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.desktop" \
2964-
"$(PREFIX)/share/applications/tremulous.desktop"
2965-
@$(INSTALL) -d "$(PREFIX)/share/metainfo/" "$(PREFIX)/share/licenses/$(PACKAGE)/"
2966-
@$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.appdata.xml" \
2960+
$(INSTALL) -D -m755 $(BR)/$(CLIENTBINSH) $(PREFIX)/bin/tremulous-grangerhub
2961+
$(INSTALL) -D -m755 $(BR)/$(SERVERBINSH) $(PREFIX)/bin/tremded-grangerhub
2962+
$(INSTALL) -D -m644 "misc/Tremulous-Grangerhub.png" "$(PREFIX)/share/icons/hicolor/128x128/apps/"
2963+
$(INSTALL) -D -m644 "misc/Tremulous-Grangerhub.desktop" \
2964+
"$(PREFIX)/share/applications/"
2965+
$(INSTALL) -D -m644 "misc/io.github.grangerhub.Tremulous.appdata.xml" \
29672966
"$(PREFIX)/share/metainfo/"
2968-
@$(INSTALL) -D -m644 "COPYING" "$(PREFIX)/share/licenses/$(PACKAGE)/"
2969-
@$(INSTALL) -D -m644 "GPL" "$(PREFIX)/share/licenses/$(PACKAGE)/"
2970-
@$(INSTALL) -D -m644 "CC" "$(PREFIX)/share/licenses/$(PACKAGE)/"
2967+
$(INSTALL) -D -m644 "COPYING" "GPL" "CC" "$(PREFIX)/share/licenses/$(PACKAGE)/"
29712968
endif
29722969

29732970

File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: misc/io.github.grangerhub.Tremulous.appdata.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<provides>
88
<id>tremulous.desktop</id>
99
</provides>
10-
<launchable type="desktop-id">io.github.grangerhub.Tremulous.desktop</launchable>
11-
<name>Tremulous</name>
10+
<launchable type="desktop-id">Tremulous-Grangerhub.desktop</launchable>
11+
<name>Tremulous-Grangerhub</name>
1212
<developer_name>Dark Legion Development and GrangerHub</developer_name>
1313
<summary>Aliens vs Humans, First Person Shooter game with elements of Real Time Strategy</summary>
1414
<description>

Diff for: misc/screenshots/a-fedora.png

-224 KB
Binary file not shown.

Diff for: misc/screenshots/b-fedora.png

-281 KB
Binary file not shown.

Diff for: misc/screenshots/c-fedora.png

-338 KB
Binary file not shown.

Diff for: misc/screenshots/e-fedora.png

-266 KB
Binary file not shown.

0 commit comments

Comments
 (0)