diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-25 20:42:34 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-25 22:13:23 +0200 |
| commit | 7a8db272e95e0d3255b515567ed5e00738cf6760 (patch) | |
| tree | e46475b2aeabffd00e117c9ebe46eec60226fed2 /shell | |
| parent | aa26a065867c36a412193db9854cf2ca97154dde (diff) | |
Start hacking --enable-canonical-installation-tree-structure back into shape
Had been totaly broken by the recent changes. (Which is fine, it is
just an experimental hack anyway, I am not sure whether it will ever
be used in anger. Just a pet peeve of mine, I dislike seeing
libraries, configuration files, resources etc mixed together in one
"program" folder, especially on OS X, where the convention is to have
app-specific dylibs and frameworks in "Frameworks", and resource files
in "Resources". But this is not any requirement as such; there are
apps in the Mac App Store that blatantly "break" this convention.)
Basically, replace uses of gb_PROGRAMDIRNAME and
gb_Package_PROGRAMDIRNAME with more specific LIBO_FOO_FOLDER, which
for normal builds all expand to the same "program" anyway.
Change-Id: I16c2b3351caa00e251e229aafbccb8346042d3c1
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Package_scripts.mk | 4 | ||||
| -rw-r--r-- | shell/Package_scripts_gnome.mk | 2 | ||||
| -rw-r--r-- | shell/Package_scripts_kde.mk | 2 | ||||
| -rw-r--r-- | shell/Package_senddoc.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk index a2af65128684..64e4fe386c32 100644 --- a/shell/Package_scripts.mk +++ b/shell/Package_scripts.mk @@ -11,10 +11,10 @@ $(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc) $(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTROOT))) -$(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/open-url,open-url.sh)) +$(eval $(call gb_Package_add_file,shell_scripts,$(LIBO_BIN_FOLDER)/open-url,open-url.sh)) ifeq ($(ENABLE_TDE),TRUE) -$(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/tde-open-url,tde-open-url.sh)) +$(eval $(call gb_Package_add_file,shell_scripts,$(LIBO_BIN_FOLDER)/tde-open-url,tde-open-url.sh)) endif # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk index 15c3015b78fd..311f2c97b83d 100644 --- a/shell/Package_scripts_gnome.mk +++ b/shell/Package_scripts_gnome.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,shell_scripts_gnome,$(SRCDIR)/shell/source/unix $(eval $(call gb_Package_set_outdir,shell_scripts_gnome,$(INSTROOT))) -$(eval $(call gb_Package_add_file,shell_scripts_gnome,$(gb_PROGRAMDIRNAME)/gnome-open-url,gnome-open-url.sh)) +$(eval $(call gb_Package_add_file,shell_scripts_gnome,$(LIBO_BIN_FOLDER)/gnome-open-url,gnome-open-url.sh)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk index c262ffa3dcc4..c53496302f84 100644 --- a/shell/Package_scripts_kde.mk +++ b/shell/Package_scripts_kde.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/m $(eval $(call gb_Package_set_outdir,shell_scripts_kde,$(INSTROOT))) -$(eval $(call gb_Package_add_file,shell_scripts_kde,$(gb_PROGRAMDIRNAME)/kde-open-url,kde-open-url.sh)) +$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Package_senddoc.mk b/shell/Package_senddoc.mk index be498e781f88..455d2b3724e0 100644 --- a/shell/Package_senddoc.mk +++ b/shell/Package_senddoc.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,shell_senddoc,$(SRCDIR)/shell/source/unix/misc) $(eval $(call gb_Package_set_outdir,shell_senddoc,$(INSTROOT))) -$(eval $(call gb_Package_add_file,shell_senddoc,$(gb_PROGRAMDIRNAME)/senddoc,senddoc.sh)) +$(eval $(call gb_Package_add_file,shell_senddoc,$(LIBO_BIN_FOLDER)/senddoc,senddoc.sh)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: |