Author: ericmaeker-guest Date: 2012-11-02 18:19:27 +0000 (Fri, 02 Nov 2012) New Revision: 12491
Modified: trunk/packages/freemedforms-project/trunk/debian/changelog trunk/packages/freemedforms-project/trunk/debian/rules Log: freemedforms: correcting the auto_configure step Modified: trunk/packages/freemedforms-project/trunk/debian/changelog =================================================================== --- trunk/packages/freemedforms-project/trunk/debian/changelog 2012-11-01 16:47:57 UTC (rev 12490) +++ trunk/packages/freemedforms-project/trunk/debian/changelog 2012-11-02 18:19:27 UTC (rev 12491) @@ -10,6 +10,7 @@ * debian/rules: * adding extra-plugins for the FreeMedForms EMR * removing unused params for the qmake + * reformatting dh_auto_configure step -- Andreas Tille <ti...@debian.org> Tue, 01 Nov 2012 18:00:00 +0200 Modified: trunk/packages/freemedforms-project/trunk/debian/rules =================================================================== --- trunk/packages/freemedforms-project/trunk/debian/rules 2012-11-01 16:47:57 UTC (rev 12490) +++ trunk/packages/freemedforms-project/trunk/debian/rules 2012-11-02 18:19:27 UTC (rev 12491) @@ -1,11 +1,11 @@ #!/usr/bin/make -f -# (c) 2012, Eric Maeker, MD (fr), The FreeMedForms project, BSD revised license +# (c) 2012, Eric Maeker, MD (fr), The FreeMedForms project, BSD 3 clause license # The @ in front of a command prevents make from displaying # vars -FREEMEDFORMS_EMR := freemedforms -FREEDIAMS := freediams -FREEACCOUNT := freeaccount +FREEMEDFORMS_EMR:=freemedforms +FREEDIAMS:=freediams +FREEACCOUNT:=freeaccount QMAKE_CONFIG := "CONFIG+=LINUX_INTEGRATED" -r QMAKE_FREEMEDFORMS_CONFIG := "CONFIG+=with-alerts" "CONFIG+=with-webcam" @@ -13,17 +13,17 @@ QMAKE_IPATH := "INSTALL_ROOT_PATH=/usr/" # func -AUTOCONF_MAIN = -D$(1) -- $(QMAKE_CONFIG) $(QMAKE_IPATH) $(QMAKE_FREEMEDFORMS_CONFIG) $(1).pro -AUTOCONF_SUB = -D$(1) -- $(QMAKE_CONFIG) $(QMAKE_IPATH) $(QMAKE_SUBPROJECT_CONFIG) $(1).pro +AUTOCONF_MAIN = $(QMAKE_CONFIG) $(QMAKE_IPATH) $(QMAKE_FREEMEDFORMS_CONFIG) $(1).pro +AUTOCONF_SUB = $(QMAKE_CONFIG) $(QMAKE_IPATH) $(QMAKE_SUBPROJECT_CONFIG) $(1).pro %: dh $@ --parallel --buildsystem=qmake_qt4 # --dbg-package=freemedforms-project-dbg override_dh_auto_configure: lrelease global_resources/translations/*.ts - dh_auto_configure $(call AUTOCONF_MAIN, $(FREEMEDFORMS_EMR)) $(extra_configure_opts) - dh_auto_configure $(call AUTOCONF_SUB, $(FREEDIAMS)) $(extra_configure_opts) - dh_auto_configure $(call AUTOCONF_SUB, $(FREEACCOUNT)) $(extra_configure_opts) + dh_auto_configure -D$(FREEMEDFORMS_EMR) -- $(call AUTOCONF_MAIN, $(FREEMEDFORMS_EMR)) $(extra_configure_opts) + dh_auto_configure -D$(FREEDIAMS) -- $(call AUTOCONF_SUB, $(FREEDIAMS)) $(extra_configure_opts) + dh_auto_configure -D$(FREEACCOUNT) -- $(call AUTOCONF_SUB, $(FREEACCOUNT)) $(extra_configure_opts) override_dh_auto_clean: rm -Rf bin _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit