diff --git a/.gitignore b/.gitignore index e2eaa36..f9b930a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ dist/saturn.cat dist/stateDir.* dist/ROMs/*rom-* +/manual/saturn.log diff --git a/Makefile b/Makefile index a3cf513..1ec5288 100644 --- a/Makefile +++ b/Makefile @@ -141,7 +141,7 @@ get-roms: make -C dist/ROMs get-roms # Installation -install: dist/saturn dist/pack dist/saturn.cat dist/Saturn.ad +install: dist/saturn dist/pack dist/saturn.cat dist/Saturn.ad manual install -m 755 -d -- $(DESTDIR)$(PREFIX)/bin install -c -m 755 dist/saturn $(DESTDIR)$(PREFIX)/bin/saturn install -c -m 755 dist/saturn48gx $(DESTDIR)$(PREFIX)/bin/saturn48gx @@ -149,27 +149,20 @@ install: dist/saturn dist/pack dist/saturn.cat dist/Saturn.ad install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/saturn install -c -m 755 dist/pack $(DESTDIR)$(PREFIX)/share/saturn/pack + install -c -m 644 dist/hplogo.png $(DESTDIR)$(PREFIX)/share/saturn/hplogo.png cp -R dist/ROMs/ $(DESTDIR)$(PREFIX)/share/saturn/ - install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/locale/C/LC_MESSAGES - install -c -m 644 dist/saturn.cat $(DESTDIR)$(PREFIX)/share/locale/C/LC_MESSAGES/saturn.cat + # install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/locale/C/LC_MESSAGES + # install -c -m 644 dist/saturn.cat $(DESTDIR)$(PREFIX)/share/locale/C/LC_MESSAGES/saturn.cat install -m 755 -d -- $(DESTDIR)/etc/X11/app-defaults install -c -m 644 dist/Saturn.ad $(DESTDIR)/etc/X11/app-defaults/Saturn - # install -c -m 755 dist/mkcard $(DESTDIR)$(PREFIX)/share/x48ng/mkcard - # install -c -m 755 dist/dump2rom $(DESTDIR)$(PREFIX)/share/x48ng/dump2rom - # install -c -m 755 dist/checkrom $(DESTDIR)$(PREFIX)/share/x48ng/checkrom - # install -c -m 644 dist/hplogo.png $(DESTDIR)$(PREFIX)/share/x48ng/hplogo.png - # cp -R dist/ROMs/ $(DESTDIR)$(PREFIX)/share/x48ng/ - # sed "s|@PREFIX@|$(PREFIX)|g" dist/setup-x48ng-home.sh > $(DESTDIR)$(PREFIX)/share/x48ng/setup-x48ng-home.sh - # chmod 755 $(DESTDIR)$(PREFIX)/share/x48ng/setup-x48ng-home.sh - # install -m 755 -d -- $(DESTDIR)$(MANDIR)/man1 # sed "s|@VERSION@|$(VERSION_MAJOR).$(VERSION_MINOR).$(PATCHLEVEL)|g" dist/x48ng.man.1 > $(DESTDIR)$(MANDIR)/man1/x48ng.1 install -m 755 -d -- $(DESTDIR)$(DOCDIR) cp -R COPYING LICENSE README* docs* manual/ $(DESTDIR)$(DOCDIR) - # install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/applications - # sed "s|@PREFIX@|$(PREFIX)|g" dist/x48ng.desktop > $(DESTDIR)$(PREFIX)/share/applications/x48ng.desktop + install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/applications + sed "s|@PREFIX@|$(PREFIX)|g" dist/saturn48gx.desktop > $(DESTDIR)$(PREFIX)/share/applications/saturn48gx.desktop diff --git a/dist/hplogo.png b/dist/hplogo.png new file mode 100644 index 0000000..a4fff9f Binary files /dev/null and b/dist/hplogo.png differ diff --git a/dist/saturn48gx.desktop b/dist/saturn48gx.desktop new file mode 100644 index 0000000..cdb5e55 --- /dev/null +++ b/dist/saturn48gx.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Version=1.0 +Type=Application +Terminal=false +Exec=@PREFIX@/bin/saturn48gx +Name=saturn48gx +Icon=@PREFIX@/share/saturn/hplogo.png +Categories=Utility;