Used the qmake-defined OBJECTS_DIR rather than the Makefile-defined o…

…ne to work around double slash issue with rpm
abshk-jr · Feb 11, 2017 · e990ac4 · e990ac4
1 parent e4c6f0d
commit e990ac4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bison.pri b/bison.pri
@@ -1,8 +1,8 @@
 {
   bison.name = Bison ${QMAKE_FILE_IN}
   bison.input = BISONSOURCES
-  bison.output = ${OBJECTS_DIR}/${QMAKE_FILE_BASE}.cxx
-  bison.commands = bison -d -p ${QMAKE_FILE_BASE} -o ${OBJECTS_DIR}/${QMAKE_FILE_BASE}.cxx --defines=${OBJECTS_DIR}/${QMAKE_FILE_BASE}.hxx ${QMAKE_FILE_IN}
+  bison.output = $${OBJECTS_DIR}/${QMAKE_FILE_BASE}.cxx
+  bison.commands = bison -d -p ${QMAKE_FILE_BASE} -o $${OBJECTS_DIR}/${QMAKE_FILE_BASE}.cxx --defines=$${OBJECTS_DIR}/${QMAKE_FILE_BASE}.hxx ${QMAKE_FILE_IN}
   bison.CONFIG += target_predeps
   bison.variable_out = GENERATED_SOURCES
   silent:bison.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands

diff --git a/flex.pri b/flex.pri
@@ -1,8 +1,8 @@
 {
   flex.name = Flex ${QMAKE_FILE_IN}
   flex.input = FLEXSOURCES
-  flex.output = ${OBJECTS_DIR}/${QMAKE_FILE_BASE}.cxx
-  flex.commands = flex -o ${OBJECTS_DIR}/${QMAKE_FILE_BASE}.cxx --header-file=${OBJECTS_DIR}/${QMAKE_FILE_BASE}.hxx ${QMAKE_FILE_IN}
+  flex.output = $${OBJECTS_DIR}/${QMAKE_FILE_BASE}.cxx
+  flex.commands = flex -o $${OBJECTS_DIR}/${QMAKE_FILE_BASE}.cxx --header-file=$${OBJECTS_DIR}/${QMAKE_FILE_BASE}.hxx ${QMAKE_FILE_IN}
   flex.CONFIG += target_predeps
   flex.variable_out = GENERATED_SOURCES
   silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands