Changeset 2420


Ignore:
Timestamp:
Jan 30, 2011, 10:46:47 PM (11 years ago)
Author:
Peter
Message:

avoid modifying yat-config during installation. Instead have a yat-config.install that gets installed (and renamed to yat-config).

Location:
trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build_support/Makefile.am

    r2418 r2420  
    2020# along with yat. If not, see <http://www.gnu.org/licenses/>.
    2121
    22 bin_SCRIPTS=yat-config
     22bin_SCRIPTS=yat-config.install
    2323
    2424pkgconfigexecdir = $(libdir)/pkgconfig
    2525pkgconfigexec_DATA= yat.pc
    2626
    27 CLEANFILES = yat.pc yat-config
     27CLEANFILES = yat.pc yat-config yat-config.install
    2828
    2929EXTRA_DIST =  move-if-change yat-config.in yat.pc.in
     
    7171  @echo creating $@
    7272
     73yat-config.install: yat-config
     74  @rm -f $@ $@-t \
     75  && sed 's|installed=no|installed=yes|g' < yat-config > $@-t \
     76  && mv $@-t $@ && echo creating $@
     77
    7378yat.pc: $(srcdir)/yat.pc.in gen_yat_pc.sh Makefile
    7479  @$(SHELL) gen_yat_pc.sh --prefix="$(prefix)" --exec-prefix="$(exec_prefix)" \
    7580  --libdir="$(libdir)" --includedir="$(includedir)" \
    76   --input="$(srcdir)/yat.pc.in" > $@-t && mv $@-t $@
    77 
     81  --input="$(srcdir)/yat.pc.in" > $@-t && mv $@-t $@ && echo creating $@
    7882
    7983install-exec-hook:
    80   $(SED) 's|installed=no|installed=yes|g' \
    81   $(DESTDIR)/$(bindir)/yat-config > $(DESTDIR)/$(bindir)/yat-config.tmp
    82   $(INSTALL) $(DESTDIR)/$(bindir)/yat-config.tmp $(DESTDIR)/$(bindir)/yat-config
    83   rm -f $(DESTDIR)/$(bindir)/yat-config.tmp
    84 
     84  rm -f $(DESTDIR)/$(bindir)/yat-config \
     85  && mv $(DESTDIR)/$(bindir)/yat-config.install $(DESTDIR)/$(bindir)/yat-config
  • trunk/test/Makefile.am

    r2413 r2420  
    8181DISTRIBUTED_TESTS = \
    8282static_test.sh \
     83yat_config_test.sh \
    8384yat_config_cblas_test.sh \
    8485yat_cpp_add_flag_test.sh \
     
    104105# dependencies for lazycheck
    105106static_test.log: $(top_srcdir)/m4/yat.m4 common_defs.sh
     107yat_config_test.log: $(top_builddir)/build_support/yat-config \
     108  $(top_builddir)/build_support/yat-config.install common_defs.sh
    106109yat_config_cblas_test.log: $(top_builddir)/build_support/yat-config \
    107110  common_defs.sh
Note: See TracChangeset for help on using the changeset viewer.