diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 00:42:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 00:50:54 +0200 |
| commit | 5397b49f4dba9d065984a8b0eb356333c565217a (patch) | |
| tree | 8fa65285b27907c6620bfd48457018d92d63253c /psprint_config | |
| parent | 06b632f0d367178b7266e50c6f140ef36984733f (diff) | |
Towards a working instdir for Mac OS X
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X,
where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so
most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK-
related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And
GeneratedPackage needed to be made more flexible, to allow for packages that go
into either of those two places.)
For Android and iOS, gb_INSTROOT probably still needs to be set.
The most obvious missing thing yet to make instdir work for Mac OS X is the
instdir/*/LibreOffice.app/Contents/ure/ vs.
instdir/*/LibreOffice.app/Contents/ure-link/ split.
Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
Diffstat (limited to 'psprint_config')
| -rw-r--r-- | psprint_config/Package_fontunxppds.mk | 2 | ||||
| -rw-r--r-- | psprint_config/Package_fontunxpsprint.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/psprint_config/Package_fontunxppds.mk b/psprint_config/Package_fontunxppds.mk index d06e0523be88..33de345cb06b 100644 --- a/psprint_config/Package_fontunxppds.mk +++ b/psprint_config/Package_fontunxppds.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds)) -$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,psprint_config_fontunxppds,$(LIBO_SHARE_FOLDER)/psprint/driver,\ SGENPRT.PS \ diff --git a/psprint_config/Package_fontunxpsprint.mk b/psprint_config/Package_fontunxpsprint.mk index f71092c532ba..7a04ec779830 100644 --- a/psprint_config/Package_fontunxpsprint.mk +++ b/psprint_config/Package_fontunxpsprint.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration)) -$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,psprint_config_fontunxpsprint,$(LIBO_SHARE_FOLDER)/psprint,\ psprint.conf \ |