Ignore:
Timestamp:
Apr 9, 2009, 10:18:54 PM (14 years ago)
Author:
Jari Häkkinen
Message:

Merged trunk changes r645:782 to replacing_gnuplot branch.

Location:
branches/replacing_gnuplot
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/replacing_gnuplot

    • Property svn:ignore
      •  

        old new  
        88autom4te.cache
        99INSTALL
        10 COPYING
        1110aclocal.m4
        1211Makefile
  • branches/replacing_gnuplot/bin/Makefile.am

    r646 r784  
    66# Copyright (C) 2006 Jari Häkkinen, Peter Johansson
    77# Copyright (C) 2007, 2008 Peter Johansson
     8# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    89#
    9 # This file is part of svndigest, http://trac.thep.lu.se/svndigest
     10# This file is part of svndigest, http://dev.thep.lu.se/svndigest
    1011#
    1112# svndigest is free software; you can redistribute it and/or modify it
    1213# under the terms of the GNU General Public License as published by
    13 # the Free Software Foundation; either version 2 of the License, or
     14# the Free Software Foundation; either version 3 of the License, or
    1415# (at your option) any later version.
    1516#
     
    2021#
    2122# You should have received a copy of the GNU General Public License
    22 # along with this program; if not, write to the Free Software
    23 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    24 # 02111-1307, USA.
     23# along with svndigest. If not, see <http://www.gnu.org/licenses/>.
    2524
    2625bin_PROGRAMS = svndigest
     
    3029noinst_HEADERS = Parameter.h
    3130
    32 LDADD = @top_builddir@/lib/libsvndigest.la $(SVNDIGEST_LIBS)
    33 AM_LDFLAGS = $(STATICFLAG) $(SVNDIGEST_LDFLAGS)
     31LDADD = $(top_builddir)/lib/libsvndigest.a $(SVNDIGEST_LIBS)
     32AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
    3433
    35 AM_CPPFLAGS = -I@top_srcdir@/lib $(SVNDIGEST_CPPFLAGS)
     34AM_CPPFLAGS = -I$(top_srcdir)/lib $(SVNDIGEST_CPPFLAGS)
    3635AM_CXXFLAGS = $(SVNDIGEST_CXXFLAGS)
    3736
    3837
    39 # install versioned binary (excluding patch version)
    40 install-exec-hook:
    41   cd $(DESTDIR)$(bindir) && \
    42   mv -f svndigest$(EXEEXT) \
    43   svndigest-$(MAJOR_VERSION).$(MINOR_VERSION)$(EXEEXT) && \
    44   $(LN_S) svndigest-$(MAJOR_VERSION).$(MINOR_VERSION)$(EXEEXT) svndigest$(EXEEXT)
    45 
    46 uninstall-hook:
    47   cd $(DESTDIR)$(bindir) && \
    48   rm -f svndigest-$(MAJOR_VERSION).$(MINOR_VERSION)$(EXEEXT)
    49 
    5038clean-local:
    5139  rm -rf *~
Note: See TracChangeset for help on using the changeset viewer.