diff options
author | Ronan Le Martret <ronan@fridu.net> | 2014-10-30 04:15:48 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2014-10-30 04:15:48 -0700 |
commit | 07a5e175b598e14b244ddcf2b890b964f855e8c5 (patch) | |
tree | 1c2062d4fbbc90d2bf3d4145a366b10562e3a1c2 | |
parent | 40acbe784cb2a2549007851e8d532f0af3676558 (diff) | |
parent | e2a82fdb80e4f2202746e388852ac39194338f0b (diff) | |
download | tizen-07a5e175b598e14b244ddcf2b890b964f855e8c5.tar.gz tizen-07a5e175b598e14b244ddcf2b890b964f855e8c5.tar.bz2 tizen-07a5e175b598e14b244ddcf2b890b964f855e8c5.zip |
Merge "will solve multi configure spec file" into tizen
-rw-r--r-- | proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros | 2 | ||||
-rw-r--r-- | proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros index a7778de86..7e7e64be9 100644 --- a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros +++ b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros @@ -849,7 +849,7 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.expand("%?_sourcedir")); # The configure macro should be invoked as %configure (rather than %{configure}) # because the rest of the arguments will be expanded using %*. # -%_configure autotools_do_configure +%_configure ./configure #------------------------------------------------------------------------------ # The make install analogue of %configure for modern autotools: diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros index 0a506ceae..f4eb4156d 100644 --- a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros +++ b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros @@ -64,10 +64,10 @@ # Tizen # %configure \ - %{_configure} + autotools_do_configure %reconfigure \ - %{_configure} + autotools_do_configure %autogen \ %reconfigure |