forked from pool/lazarus
Eric Schirra
4ea424919d
- Update to 2.2.2
* For a complete list of changes see:
https://wiki.freepascal.org/Lazarus_2.2_fixes_branch#Fixes_for_2.2.2_.28merged.29
- Rebase lazarus-Makefile_patch.diff, because some things in
upstream now.
- Drop fix-object-inspector-visible.patch because now in upstream.
OBS-URL: https://build.opensuse.org/request/show/978397
OBS-URL: https://build.opensuse.org/package/show/devel:languages:pascal/lazarus?expand=0&rev=77
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
Index: lazarus/Makefile.fpc
|
|
===================================================================
|
|
--- lazarus.orig/Makefile.fpc
|
|
+++ lazarus/Makefile.fpc
|
|
@@ -20,7 +20,7 @@ files=$(wildcard *$(OEXT)) $(wildcard *$
|
|
|
|
[install]
|
|
fpcpackage=n
|
|
-basedir=share/lazarus
|
|
+basedir=$(_LIB)/lazarus
|
|
|
|
[dist]
|
|
destdir=$(BASEDIR)/dist
|
|
@@ -29,7 +29,7 @@ destdir=$(BASEDIR)/dist
|
|
RCPP?=$(strip $(firstword cpp$(SRCEXEEXT)))
|
|
#
|
|
ifndef LAZARUS_INSTALL_DIR
|
|
-LAZARUS_INSTALL_DIR=$(INSTALL_PREFIX)/share/lazarus
|
|
+LAZARUS_INSTALL_DIR=$(INSTALL_PREFIX)/$(_LIB)/lazarus
|
|
INSTALL_MAN_DIR=$(INSTALL_PREFIX)/share/man
|
|
ifneq ($(findstring $(OS_TARGET),win32 win64),)
|
|
LAZARUS_INSTALL_DIR=C:\lazarus
|
|
@@ -287,8 +287,8 @@ installbase:
|
|
ifneq ($(findstring $(OS_TARGET),win32 win64),)
|
|
|
|
else
|
|
- $(MKDIR) $(INSTALL_PREFIX)/share
|
|
- $(MKDIR) $(INSTALL_PREFIX)/share/lazarus
|
|
+ $(MKDIR) $(INSTALL_PREFIX)/$(_LIB)
|
|
+ $(MKDIR) $(INSTALL_PREFIX)/$(_LIB)/lazarus
|
|
$(MKDIR) $(INSTALL_PREFIX)/share/applications
|
|
$(MKDIR) $(INSTALL_PREFIX)/share/pixmaps
|
|
$(MKDIR) $(INSTALL_PREFIX)/share/mime/packages
|