X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=mk%2Fjam%2Finstall.jam;h=a2cfefd6c425c42693f38732c86887b5c3595e21;hb=d8496f30a608d6827fefdfe33234acb6f4d8f0fe;hp=ad85e41c29935d88de334337af45432a9d6c9974;hpb=6c3a5307b87bc3fff19e819281cf2b87a2b5010b;p=supertux.git

diff --git a/mk/jam/install.jam b/mk/jam/install.jam
index ad85e41c2..a2cfefd6c 100644
--- a/mk/jam/install.jam
+++ b/mk/jam/install.jam
@@ -14,6 +14,8 @@ appdatadir ?= [ ConcatDirs $(datadir) $(PACKAGE_NAME) ] ;
 appdocdir ?= [ ConcatDirs $(datadir) doc $(PACKAGE_NAME)-$(PACKAGE_VERSION) ] ;
 appconfdir ?= [ ConcatDirs $(sysconfdir) $(PACKAGE_NAME) ] ;
 plugindir ?= [ ConcatDirs $(libdir) $(PACKAGE_NAME) ] ;
+applicationsdir ?= [ ConcatDirs $(datadir) applications ] ;
+pixmapsdir ?= [ ConcatDirs $(datadir) pixmaps ] ;
 
 ##  InstallHeader headername [ : subdir ]
 ##    DoInstall a headerfile into the includedir directory. A subdirectory
@@ -85,6 +87,24 @@ rule InstallMan
     }
 }
 
+##  InstallPixmap files [ : subdir ]
+##    Install a pixmap
+rule InstallPixmap
+{
+    LOCATE on $(<:G=installpixmap) = $(SUBDIR) ;
+    Depends install_data
+        : [ DoInstall $(<:G=installpixmap) : $(pixmapsdir) $(2) ] ;
+}
+
+##  InstallDesktop files [ : subdir ]
+##    Install a .desktop file (menu entries for kde/gnome and others)
+rule InstallDesktop
+{
+    LOCATE on $(<:G=installdesktop) = $(SUBDIR) ;
+    Depends install_bin
+        : [ DoInstall $(<:G=installdesktop) : $(applicationsdir) $(2) ] ;
+}
+
 ##  DoInstall sourcename : directories [ : installapp ] [ : options ]
 ##    Creates a new installtarget for the given sources. The target(s) are
 ##    returned as function result.
@@ -132,7 +152,7 @@ Help install : "Install $(PACKAGE_NAME)" ;
 
 actions Install1
 {
-  $(INSTALL) "$(>)" "$(<:D)" $(INSTALLFLAGS) ;
+  $(INSTALL) "$(>)" "$(<:D)" $(INSTALLIBS) ;
 }
 
 actions CopyDirs