diff options
| author | John Wiegley <johnw@newartisans.com> | 2008-08-26 10:10:16 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2008-08-26 10:10:16 -0400 |
| commit | 00ca034e737c4ae7d2cd3e4df5e61e492e288e46 (patch) | |
| tree | 37506da4ff612439a809334cf1c9a210a550f91f /Makefile.am | |
| parent | 910f16509699ec6afd51d228d2689aabe8fc1256 (diff) | |
| parent | 37cf3c6f6e54de338a5d16e0ff7a62754533fe22 (diff) | |
| download | fork-ledger-00ca034e737c4ae7d2cd3e4df5e61e492e288e46.tar.gz fork-ledger-00ca034e737c4ae7d2cd3e4df5e61e492e288e46.tar.bz2 fork-ledger-00ca034e737c4ae7d2cd3e4df5e61e492e288e46.zip | |
Merge branch git://github.com/levindu/ledger.git 'master' into v2.6.1b
Conflicts:
Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 6208cd80..e9c6070a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -134,7 +134,7 @@ install-exec-hook: CFLAGS="$(CPPFLAGS) -I$(srcdir) $(libamounts_la_CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)" \ LDFLAGS="$(LDFLAGS) -L$(top_builddir) -L$(top_builddir)/.libs" \ ARCHFLAGS="$(ARCHFLAGS)" SRCDIR="$(srcdir)" \ - python setup.py install --prefix=$(prefix) + python setup.py install --prefix=$(prefix) --root=$(DESTDIR)/ endif |