diff --git a/README-1.md b/README-1.md index e7c766f..894db04 100644 --- a/README-1.md +++ b/README-1.md @@ -18,13 +18,14 @@ Build (for the impatient) In `src/` do: ``` - $ export QT_INSTALL_LIBS=/usr/lib # Unix - $ ecl -shell make # will take a while $ qmake eql5.pro $ make $ sudo make install # Unix ``` +*Please note that the eql5 libs are now installed in `$$[QT_INSTALL_LIBS]`, so +you'll need to manually remove any eventually present old version from e.g. +`/usr/lib/`.* Now you should be able to run `eql5`. @@ -102,11 +103,6 @@ same compiler you'll use to compile EQL5): [https://download.qt.io/archive/qt/](https://download.qt.io/archive/qt/) -Choose where to install the libs: -``` - $ export QT_INSTALL_LIBS=/usr/lib # Unix -``` - Qt4/Qt5 note: You can have both old EQL (Qt4) and EQL5 (Qt5) installed in parallel (exe and diff --git a/src/eql_exe.pro b/src/eql_exe.pro index e3bdbab..a0ced69 100644 --- a/src/eql_exe.pro +++ b/src/eql_exe.pro @@ -18,7 +18,7 @@ osx { target.path = /usr/local/bin } -INSTALLS = target +INSTALLS = target win32 { include(windows.pri) diff --git a/src/eql_lib.pro b/src/eql_lib.pro index 3c357dd..62277d0 100644 --- a/src/eql_lib.pro +++ b/src/eql_lib.pro @@ -21,7 +21,7 @@ include.files = eql5/* linux { include.path = /usr/include/eql5 - target.path = $$(QT_INSTALL_LIBS) + target.path = $$[QT_INSTALL_LIBS] } osx { @@ -63,7 +63,7 @@ static { combinedlib.files = libeql5.a libeql5.prl combinedlib.extra = ecl -shell make-static.lisp - combinedlib.path = $$(QT_INSTALL_LIBS) + combinedlib.path = $$[QT_INSTALL_LIBS] INSTALLS = combinedlib } diff --git a/src/module_help.pro b/src/module_help.pro index 99c045c..319f97b 100644 --- a/src/module_help.pro +++ b/src/module_help.pro @@ -11,7 +11,7 @@ MOC_DIR = ./tmp/help/ VERSION = $$(EQL_VERSION) linux { - target.path = $$(QT_INSTALL_LIBS) + target.path = $$[QT_INSTALL_LIBS] } osx { diff --git a/src/module_multimedia.pro b/src/module_multimedia.pro index 04f93ba..7f0465c 100644 --- a/src/module_multimedia.pro +++ b/src/module_multimedia.pro @@ -11,7 +11,7 @@ MOC_DIR = ./tmp/multimedia/ VERSION = $$(EQL_VERSION) linux { - target.path = $$(QT_INSTALL_LIBS) + target.path = $$[QT_INSTALL_LIBS] } osx { diff --git a/src/module_network.pro b/src/module_network.pro index eb436f9..e95e9d1 100644 --- a/src/module_network.pro +++ b/src/module_network.pro @@ -11,7 +11,7 @@ MOC_DIR = ./tmp/network/ VERSION = $$(EQL_VERSION) linux { - target.path = $$(QT_INSTALL_LIBS) + target.path = $$[QT_INSTALL_LIBS] } osx { diff --git a/src/module_quick.pro b/src/module_quick.pro index a466726..cb13a49 100644 --- a/src/module_quick.pro +++ b/src/module_quick.pro @@ -11,7 +11,7 @@ MOC_DIR = ./tmp/quick/ VERSION = $$(EQL_VERSION) linux { - target.path = $$(QT_INSTALL_LIBS) + target.path = $$[QT_INSTALL_LIBS] } osx { diff --git a/src/module_sql.pro b/src/module_sql.pro index bf4b608..cc1250f 100644 --- a/src/module_sql.pro +++ b/src/module_sql.pro @@ -11,7 +11,7 @@ MOC_DIR = ./tmp/sql/ VERSION = $$(EQL_VERSION) linux { - target.path = $$(QT_INSTALL_LIBS) + target.path = $$[QT_INSTALL_LIBS] } osx { diff --git a/src/module_svg.pro b/src/module_svg.pro index 83cea90..55cf696 100644 --- a/src/module_svg.pro +++ b/src/module_svg.pro @@ -11,7 +11,7 @@ MOC_DIR = ./tmp/svg/ VERSION = $$(EQL_VERSION) linux { - target.path = $$(QT_INSTALL_LIBS) + target.path = $$[QT_INSTALL_LIBS] } osx { diff --git a/src/module_webengine.pro b/src/module_webengine.pro index dd7e0bd..6fbd155 100644 --- a/src/module_webengine.pro +++ b/src/module_webengine.pro @@ -11,7 +11,7 @@ MOC_DIR = ./tmp/webengine/ VERSION = $$(EQL_VERSION) linux { - target.path = $$(QT_INSTALL_LIBS) + target.path = $$[QT_INSTALL_LIBS] } osx { diff --git a/src/module_webkit.pro b/src/module_webkit.pro index 21f0e5b..9331ef4 100644 --- a/src/module_webkit.pro +++ b/src/module_webkit.pro @@ -12,7 +12,7 @@ VERSION = $$(EQL_VERSION) macx:QT += network linux { - target.path = $$(QT_INSTALL_LIBS) + target.path = $$[QT_INSTALL_LIBS] } osx {