diff --git a/src/pushpin/pushpin.pro b/src/pushpin/pushpin.pro index cc10c734..7eb4a1af 100644 --- a/src/pushpin/pushpin.pro +++ b/src/pushpin/pushpin.pro @@ -2,6 +2,9 @@ TEMPLATE = aux include($$OUT_PWD/../../conf.pri) +root_dir = $$PWD/../.. +bin_dir = $$root_dir/bin + # generate pushpin.conf for installation pushpin_conf_inst.target = pushpin.conf.inst @@ -11,6 +14,23 @@ pushpin_conf_inst.depends = ../../examples/config/pushpin.conf QMAKE_EXTRA_TARGETS += pushpin_conf_inst PRE_TARGETDEPS += pushpin.conf.inst +# install bin files + +unix:!isEmpty(BINDIR) { + binfiles.path = $$BINDIR + binfiles.files = \ + $$bin_dir/condure \ + $$bin_dir/m2adapter \ + $$bin_dir/pushpin-proxy \ + $$bin_dir/pushpin-handler \ + $$root_dir/pushpin-legacy \ + $$root_dir/pushpin \ + $$bin_dir/pushpin-publish + binfiles.CONFIG += no_check_exist executable + + INSTALLS += binfiles +} + # install lib files libfiles.path = $$LIBDIR diff --git a/src/rust/lib.pri b/src/rust/lib.pri deleted file mode 100644 index 675ccd26..00000000 --- a/src/rust/lib.pri +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG(debug, debug|release) { - RUST_BUILD_DIR = $$PWD/../../target/debug -} else { - RUST_BUILD_DIR = $$PWD/../../target/release -} - -LIBS += -L$$RUST_BUILD_DIR -lpushpin - -unix:!mac: LIBS += -ldl -mac:LIBS += -framework CoreFoundation -framework Security - -PRE_TARGETDEPS += $$RUST_BUILD_DIR/libpushpin.a diff --git a/src/rust/rust.pro b/src/rust/rust.pro index c57e006c..682782e3 100644 --- a/src/rust/rust.pro +++ b/src/rust/rust.pro @@ -5,8 +5,8 @@ CONFIG -= debug_and_release debug include($$OUT_PWD/../../conf.pri) -bin_dir = $$PWD/../../bin root_dir = $$PWD/../.. +bin_dir = $$root_dir/bin CONFIG(debug, debug|release) { cargo_flags = @@ -110,18 +110,3 @@ PRE_TARGETDEPS += \ $$root_dir/pushpin-legacy \ $$root_dir/pushpin \ $$bin_dir/pushpin-publish - -unix:!isEmpty(BINDIR) { - binfiles.path = $$BINDIR - binfiles.files = \ - $$bin_dir/condure \ - $$bin_dir/m2adapter \ - $$bin_dir/pushpin-proxy \ - $$bin_dir/pushpin-handler \ - $$root_dir/pushpin-legacy \ - $$root_dir/pushpin \ - $$bin_dir/pushpin-publish - binfiles.CONFIG += no_check_exist executable - - INSTALLS += binfiles -}