From: Daniel Caujolle-B. <f1...@us...> - 2001-10-05 13:49:55
|
Update of /cvsroot/xine/xine-ui/misc/desktops In directory usw-pr-cvs1:/tmp/cvs-serv12486/misc/desktops Modified Files: Makefile.am Log Message: Add xineshot script (not as provided patch). Fixed $DESTDIR stuff, use it for rpms builds. I will made xineshot button in few hours. Index: Makefile.am =================================================================== RCS file: /cvsroot/xine/xine-ui/misc/desktops/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.am 2001/09/27 21:36:13 1.1 +++ Makefile.am 2001/10/05 13:49:51 1.2 @@ -8,68 +8,72 @@ debug: install-debug: install +# Install only as root install-data-local: + if [ "`id -g`" -eq 0 ]; then \ ## Icons - $(mkinstalldirs) /usr/share/icons; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.xpm /usr/share/icons/xine.xpm; \ - $(mkinstalldirs) /usr/share/pixmaps; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.xpm /usr/share/pixmaps/xine.xpm; \ - if test -d /etc/X11/wmconfig; then \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.wmconfig /etc/X11/wmconfig/xine; \ - fi; \ - if test -d /etc/X11/applnk/; then \ - $(mkinstalldirs) /etc/X11/applnk/Multimedia; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.desktop /etc/X11/applnk/Multimedia/xine.desktop; \ - fi; \ + echo "Installing destops icons/entries"; \ + $(mkinstalldirs) /usr/share/icons; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /usr/share/icons/xine.xpm; \ + $(mkinstalldirs) /usr/share/pixmaps; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /usr/share/pixmaps/xine.xpm; \ + if test -d /etc/X11/wmconfig; then \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.wmconfig /etc/X11/wmconfig/xine; \ + fi; \ + if test -d /etc/X11/applnk/; then \ + $(mkinstalldirs) /etc/X11/applnk/Multimedia; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /etc/X11/applnk/Multimedia/xine.desktop; \ + fi; \ ## End Icons ## Gnome - if test -d /opt/gnome; then \ - $(mkinstalldirs) /opt/gnome/share/pixmaps; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.xpm /opt/gnome/share/pixmaps/xine.xpm; \ - $(mkinstalldirs) /opt/gnome/share/gnome/apps/Multimedia; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.desktop /opt/gnome/share/gnome/apps/Multimedia/xine.desktop; \ - else \ - if test -d /usr/share/gnome/apps; then \ - $(mkinstalldirs) /usr/share/gnome/apps/Multimedia; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.desktop /usr/share/gnome/apps/Multimedia/xine.desktop; \ + if test -d /opt/gnome; then \ + $(mkinstalldirs) /opt/gnome/share/pixmaps; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /opt/gnome/share/pixmaps/xine.xpm; \ + $(mkinstalldirs) /opt/gnome/share/gnome/apps/Multimedia; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /opt/gnome/share/gnome/apps/Multimedia/xine.desktop; \ + else \ + if test -d /usr/share/gnome/apps; then \ + $(mkinstalldirs) /usr/share/gnome/apps/Multimedia; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /usr/share/gnome/apps/Multimedia/xine.desktop; \ + fi; \ fi; \ - fi; \ ## End Gnome ## Kde2 - if test -d /opt/kde2; then \ - DIR_HI=/opt/kde2/share/icons/hicolor; \ - DIR_LO=/opt/kde2/share/icons/locolor; \ - HIRES='48x48 32x32 22x22'; \ - LORES='32x32 22x22 16x16'; \ - for hires in $$HIRES; do \ - $(mkinstalldirs) $$DIR_HI/$$hires/apps; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine_$$hires.png $$DIR_HI/$$hires/apps/xine.png; \ - done; \ - for lores in $$LORES; do \ - $(mkinstalldirs) $$DIR_LO/$$lores/apps; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine_$$lores.png $$DIR_LO/$$lores/apps/xine.png; \ - done; \ - $(mkinstalldirs) /opt/kde2/share/applnk/Multimedia; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.desktop /opt/kde2/share/applnk/Multimedia/xine.desktop; \ - else \ - if test -d /usr/share/applnk/Multimedia; then \ - $(mkinstalldirs) /usr/share/applnk/Multimedia; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.desktop /usr/share/applnk/Multimedia/xine.desktop; \ + if test -d /opt/kde2; then \ + DIR_HI=/opt/kde2/share/icons/hicolor; \ + DIR_LO=/opt/kde2/share/icons/locolor; \ + HIRES='48x48 32x32 22x22'; \ + LORES='32x32 22x22 16x16'; \ + for hires in $$HIRES; do \ + $(mkinstalldirs) $$DIR_HI/$$hires/apps; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine_$$hires.png $$DIR_HI/$$hires/apps/xine.png; \ + done; \ + for lores in $$LORES; do \ + $(mkinstalldirs) $$DIR_LO/$$lores/apps; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine_$$lores.png $$DIR_LO/$$lores/apps/xine.png; \ + done; \ + $(mkinstalldirs) /opt/kde2/share/applnk/Multimedia; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /opt/kde2/share/applnk/Multimedia/xine.desktop; \ + else \ + if test -d /usr/share/applnk/Multimedia; then \ + $(mkinstalldirs) /usr/share/applnk/Multimedia; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /usr/share/applnk/Multimedia/xine.desktop; \ + fi; \ fi; \ - fi; \ ## End Kde2 ## Kde - if test -d /opt/kde/; then \ - $(mkinstalldirs) /opt/kde/share/icons; \ - $(mkinstalldirs) /opt/kde/share/applnk/Multimedia/; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.xpm /opt/kde/share/icons/xine.xpm; \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.desktop /opt/kde/share/applnk/Multimedia/xine.desktop; \ - else \ - if test -d /usr/share/applnk/Multimedia/; then \ - $(INSTALL_DATA) -o 0 -g 0 @XINE_DESKTOPDIR@/xine.desktop /usr/share/applnk/Multimedia/xine.desktop; \ + if test -d /opt/kde/; then \ + $(mkinstalldirs) /opt/kde/share/icons; \ + $(mkinstalldirs) /opt/kde/share/applnk/Multimedia/; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.xpm /opt/kde/share/icons/xine.xpm; \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /opt/kde/share/applnk/Multimedia/xine.desktop; \ + else \ + if test -d /usr/share/applnk/Multimedia/; then \ + $(INSTALL_DATA) -o 0 -g 0 $(DESTDIR)@XINE_DESKTOPDIR@/xine.desktop /usr/share/applnk/Multimedia/xine.desktop; \ + fi; \ fi; \ - fi ## End Kde + fi uninstall-local: REMOVALS='/usr/share/icons/xine.xpm /usr/share/pixmaps/xine.xpm /etc/X11/wmconfig/xine /etc/X11/applnk/Multimedia/xine.desktop /opt/gnome/share/pixmaps/xine.xpm /opt/gnome/share/gnome/apps/Multimedia/xine.desktop /usr/share/gnome/apps/Multimedia/xine.desktop /opt/kde2/share/applnk/Multimedia/xine.desktop /usr/share/applnk/Multimedia/xine.desktop /opt/kde/share/icons/xine.xpm /opt/kde/share/applnk/Multimedia/xine.desktop /usr/share/applnk/Multimedia/xine.desktop'; \ |