DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Added a prefix to the desktop files

Browse Source
This commit is contained in:
Pierre Pronchery 2013-11-24 02:23:30 +01:00
parent 6f60bf2a79
commit 072d006d72
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -23,8 +23,8 @@ dist:
@$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \ @$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \
$(PACKAGE)-$(VERSION)/data/Makefile \ $(PACKAGE)-$(VERSION)/data/Makefile \
$(PACKAGE)-$(VERSION)/data/Browser.pc.in \ $(PACKAGE)-$(VERSION)/data/Browser.pc.in \
$(PACKAGE)-$(VERSION)/data/browser.desktop \ $(PACKAGE)-$(VERSION)/data/deforaos-browser.desktop \
$(PACKAGE)-$(VERSION)/data/desktop-settings.desktop \ $(PACKAGE)-$(VERSION)/data/deforaos-desktop-settings.desktop \
$(PACKAGE)-$(VERSION)/data/pkgconfig.sh \ $(PACKAGE)-$(VERSION)/data/pkgconfig.sh \
$(PACKAGE)-$(VERSION)/data/project.conf \ $(PACKAGE)-$(VERSION)/data/project.conf \
$(PACKAGE)-$(VERSION)/data/16x16/Makefile \ $(PACKAGE)-$(VERSION)/data/16x16/Makefile \

8
data/Makefile
View File

@ -34,14 +34,14 @@ install: $(TARGETS)
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done
./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -i -- "Browser.pc" ./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -i -- "Browser.pc"
$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications $(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
$(INSTALL) -m 0644 browser.desktop $(DESTDIR)$(PREFIX)/share/applications/browser.desktop $(INSTALL) -m 0644 deforaos-browser.desktop $(DESTDIR)$(PREFIX)/share/applications/deforaos-browser.desktop
$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications $(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
$(INSTALL) -m 0644 desktop-settings.desktop $(DESTDIR)$(PREFIX)/share/applications/desktop-settings.desktop $(INSTALL) -m 0644 deforaos-desktop-settings.desktop $(DESTDIR)$(PREFIX)/share/applications/deforaos-desktop-settings.desktop
uninstall: uninstall:
@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done @for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -u -- "Browser.pc" ./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -u -- "Browser.pc"
$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/browser.desktop $(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-browser.desktop
$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/desktop-settings.desktop $(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-desktop-settings.desktop
.PHONY: all subdirs clean distclean install uninstall .PHONY: all subdirs clean distclean install uninstall

0
data/browser.desktop → data/deforaos-browser.desktop
View File

0
data/desktop-settings.desktop → data/deforaos-desktop-settings.desktop
View File

6
data/project.conf
View File

@ -1,6 +1,6 @@
subdirs=16x16 subdirs=16x16
targets=Browser.pc targets=Browser.pc
dist=Makefile,Browser.pc.in,browser.desktop,desktop-settings.desktop,pkgconfig.sh dist=Makefile,Browser.pc.in,deforaos-browser.desktop,deforaos-desktop-settings.desktop,pkgconfig.sh
[Browser.pc] [Browser.pc]
type=script type=script
@ -8,8 +8,8 @@ script=./pkgconfig.sh
depends=Browser.pc.in,../config.sh depends=Browser.pc.in,../config.sh
install= install=
[browser.desktop] [deforaos-browser.desktop]
install=$(PREFIX)/share/applications install=$(PREFIX)/share/applications
[desktop-settings.desktop] [deforaos-desktop-settings.desktop]
install=$(PREFIX)/share/applications install=$(PREFIX)/share/applications