| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889 |
- Index: cogito-0.18.2/Makefile
- --- cogito-0.18.2/Makefile.orig 2006-11-17 01:37:24 +0100
- +++ cogito-0.18.2/Makefile 2007-10-05 09:53:14 +0200
- @@ -2,8 +2,8 @@
- prefix="$(HOME)"
-
- bindir=$(prefix)/bin
- -libdir=$(prefix)/lib/cogito
- -sharedir=$(prefix)/share/cogito
- +libdir=$(prefix)/lib/git/cogito
- +sharedir=$(prefix)/share/git/cogito
-
- INSTALL?=install
-
- Index: git-1.5.3.6/Makefile
- --- git-1.5.3.6/Makefile.orig 2007-10-03 21:44:53 +0200
- +++ git-1.5.3.6/Makefile 2007-10-05 09:53:14 +0200
- @@ -145,7 +145,7 @@
- bindir = $(prefix)/bin
- gitexecdir = $(bindir)
- sharedir = $(prefix)/share
- -template_dir = $(sharedir)/git-core/templates
- +template_dir = $(sharedir)/git/core/templates
- ifeq ($(prefix),/usr)
- sysconfdir = /etc
- else
- @@ -507,10 +507,10 @@
- ifndef NO_CURL
- ifdef CURLDIR
- # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
- - BASIC_CFLAGS += -I$(CURLDIR)/include
- - CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
- + BASIC_CFLAGS += `$(CURLDIR)/bin/curl-config --cflags`
- + CURL_LIBCURL = `$(CURLDIR)/bin/curl-config --libs`
- else
- - CURL_LIBCURL = -lcurl
- + CURL_LIBCURL = -lcurl -lssl -lcrypto
- endif
- PROGRAMS += git-http-fetch$X
- curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
- Index: git-1.5.3.6/perl/Makefile.PL
- --- git-1.5.3.6/perl/Makefile.PL.orig 2007-10-03 21:44:53 +0200
- +++ git-1.5.3.6/perl/Makefile.PL 2007-10-05 09:56:53 +0200
- @@ -29,6 +29,6 @@
- VERSION_FROM => 'Git.pm',
- PM => \%pm,
- MAKEFILE => 'perl.mak',
- - INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3',
- + INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3',
- %extra
- );
- Index: stgit-0.13/setup.py
- --- stgit-0.13/setup.py.orig 2007-02-13 23:27:01 +0100
- +++ stgit-0.13/setup.py 2007-10-05 09:53:14 +0200
- @@ -15,10 +15,10 @@
- long_description = 'Push/pop utility on top of GIT',
- scripts = ['stg'],
- packages = ['stgit', 'stgit.commands'],
- - data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')),
- - ('share/stgit/examples', glob.glob('examples/*.tmpl')),
- - ('share/stgit/examples', ['examples/gitconfig']),
- - ('share/stgit/contrib', ['contrib/diffcol.sh',
- + data_files = [('share/git/stgit/templates', glob.glob('templates/*.tmpl')),
- + ('share/git/stgit/examples', glob.glob('examples/*.tmpl')),
- + ('share/git/stgit/examples', ['examples/gitconfig']),
- + ('share/git/stgit/contrib', ['contrib/diffcol.sh',
- 'contrib/stgbashprompt.sh',
- 'contrib/stgit-completion.bash']),
- ('share/doc/stgit', glob.glob('doc/*.txt'))]
- Index: stgit-0.13/stg
- --- stgit-0.13/stg.orig 2006-04-07 23:38:54 +0200
- +++ stgit-0.13/stg 2007-10-05 09:53:14 +0200
- @@ -26,12 +26,13 @@
- # It is assumed that the user installed StGIT using the --prefix= option
- prefix, bin = os.path.split(sys.path[0])
-
- -if bin == 'bin' and prefix != sys.prefix:
- +if bin == 'bin':
- sys.prefix = prefix
- sys.exec_prefix = prefix
-
- major, minor = sys.version_info[0:2]
- - local_path = [os.path.join(prefix, 'lib', 'python'),
- + local_path = [os.path.join(prefix, 'lib', 'git'),
- + os.path.join(prefix, 'lib', 'python'),
- os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor)),
- os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor),
- 'site-packages')]
|
