Installing the wireless browser by default

This commit is contained in:
Pierre Pronchery 2013-12-06 08:50:51 +01:00
parent 519b6337b9
commit dfedc15b9d
6 changed files with 20 additions and 1 deletions

View File

@ -24,6 +24,7 @@ dist:
$(PACKAGE)-$(VERSION)/data/Makefile \ $(PACKAGE)-$(VERSION)/data/Makefile \
$(PACKAGE)-$(VERSION)/data/Panel.pc.in \ $(PACKAGE)-$(VERSION)/data/Panel.pc.in \
$(PACKAGE)-$(VERSION)/data/deforaos-panel-settings.desktop \ $(PACKAGE)-$(VERSION)/data/deforaos-panel-settings.desktop \
$(PACKAGE)-$(VERSION)/data/deforaos-wifibrowser.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 \

View File

@ -35,10 +35,13 @@ install: $(TARGETS)
./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -i -- "Panel.pc" ./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -i -- "Panel.pc"
$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications $(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
$(INSTALL) -m 0644 deforaos-panel-settings.desktop $(DESTDIR)$(PREFIX)/share/applications/deforaos-panel-settings.desktop $(INSTALL) -m 0644 deforaos-panel-settings.desktop $(DESTDIR)$(PREFIX)/share/applications/deforaos-panel-settings.desktop
$(MKDIR) $(DESTDIR)$(PREFIX)/share/applications
$(INSTALL) -m 0644 deforaos-wifibrowser.desktop $(DESTDIR)$(PREFIX)/share/applications/deforaos-wifibrowser.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 -- "Panel.pc" ./pkgconfig.sh -P "$(DESTDIR)$(PREFIX)" -u -- "Panel.pc"
$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-panel-settings.desktop $(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-panel-settings.desktop
$(RM) -- $(DESTDIR)$(PREFIX)/share/applications/deforaos-wifibrowser.desktop
.PHONY: all subdirs clean distclean install uninstall .PHONY: all subdirs clean distclean install uninstall

View File

@ -0,0 +1,8 @@
[Desktop Entry]
Name=Wireless networks
Comment=Connect to wireless networks
TryExec=wifibrowser
Exec=wifibrowser
Icon=network-wireless
Type=Application
Categories=Settings;GTK;

View File

@ -1,6 +1,6 @@
subdirs=16x16,22x22,24x24,32x32,48x48,scalable subdirs=16x16,22x22,24x24,32x32,48x48,scalable
targets=Panel.pc targets=Panel.pc
dist=Makefile,Panel.pc.in,deforaos-panel-settings.desktop,pkgconfig.sh dist=Makefile,Panel.pc.in,deforaos-panel-settings.desktop,deforaos-wifibrowser.desktop,pkgconfig.sh
[Panel.pc] [Panel.pc]
type=script type=script
@ -10,3 +10,6 @@ install=
[deforaos-panel-settings.desktop] [deforaos-panel-settings.desktop]
install=$(PREFIX)/share/applications install=$(PREFIX)/share/applications
[deforaos-wifibrowser.desktop]
install=$(PREFIX)/share/applications

View File

@ -80,10 +80,13 @@ install: $(TARGETS)
$(INSTALL) -m 0755 panel-message $(DESTDIR)$(BINDIR)/panel-message $(INSTALL) -m 0755 panel-message $(DESTDIR)$(BINDIR)/panel-message
$(MKDIR) $(DESTDIR)$(BINDIR) $(MKDIR) $(DESTDIR)$(BINDIR)
$(INSTALL) -m 0755 panel-notify $(DESTDIR)$(BINDIR)/panel-notify $(INSTALL) -m 0755 panel-notify $(DESTDIR)$(BINDIR)/panel-notify
$(MKDIR) $(DESTDIR)$(BINDIR)
$(INSTALL) -m 0755 wifibrowser $(DESTDIR)$(BINDIR)/wifibrowser
uninstall: uninstall:
$(RM) -- $(DESTDIR)$(BINDIR)/panel-embed $(RM) -- $(DESTDIR)$(BINDIR)/panel-embed
$(RM) -- $(DESTDIR)$(BINDIR)/panel-message $(RM) -- $(DESTDIR)$(BINDIR)/panel-message
$(RM) -- $(DESTDIR)$(BINDIR)/panel-notify $(RM) -- $(DESTDIR)$(BINDIR)/panel-notify
$(RM) -- $(DESTDIR)$(BINDIR)/wifibrowser
.PHONY: all clean distclean install uninstall .PHONY: all clean distclean install uninstall

View File

@ -33,6 +33,7 @@ sources=test.c
type=binary type=binary
cppflags=-I ../include cppflags=-I ../include
sources=wifibrowser.c sources=wifibrowser.c
install=$(BINDIR)
[embed.c] [embed.c]
depends=../include/Panel.h,../config.h depends=../include/Panel.h,../config.h