diff options
| author | Matteo Casalin <matteo.casalin@gmx.com> | 2012-11-10 22:14:47 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-11 08:05:14 +0000 |
| commit | e7037b2e7e487d6075d17fcff7cd95a6e98700c0 (patch) | |
| tree | ff40c1c48be251784ac4bd566273cdbce3743890 /scp2 | |
| parent | cee6c4b193eff4f499e60867766c13fda3818239 (diff) | |
Kill set_oenv remnants (by just renaming the required timestamp file)
Change-Id: I779128111a4f69235a4c8cc6510018fc61d1b24b
Reviewed-on: https://gerrit.libreoffice.org/1026
Tested-by: Tor Lillqvist <tml@iki.fi>
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/CustomTarget_langmacros.mk | 4 | ||||
| -rw-r--r-- | scp2/macros/macro.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk index 1d1a15793d69..19c680fcac02 100644 --- a/scp2/CustomTarget_langmacros.mk +++ b/scp2/CustomTarget_langmacros.mk @@ -31,10 +31,10 @@ $(call gb_CustomTarget_get_target,scp2/macros) : $(call gb_CustomTarget_get_work $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :| $(call gb_CustomTarget_get_workdir,scp2/macros)/.dir -$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(SRCDIR)/set_soenv.stamp +$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(SRCDIR)/config_host.mk.stamp $(call gb_Helper_abbreviate_dirs,\ export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \ - $(PERL) $< -verbose -o $@ -c $(SRCDIR)/set_soenv.stamp \ + $(PERL) $< -verbose -o $@ -c $(SRCDIR)/config_host.mk.stamp \ ) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl index 9ea949cccf74..dc5d2a978a31 100644 --- a/scp2/macros/macro.pl +++ b/scp2/macros/macro.pl @@ -261,7 +261,7 @@ sub args_require_build # changed script - run always return 1 if (stat($0))[9] > (stat("$destfile"))[9] ; - # changed set_soenv.stamp - run always + # changed config timestamp - run always if (-f "$config_stamp") { return 1 if (stat($config_stamp))[9] > (stat($destfile))[9]; } |