]>
Commit | Line | Data |
---|---|---|
9f77e214 JR |
1 | --- postgresql-7.1/src/pl/plperl/Makefile.PL~ Sun May 6 05:10:08 2001 |
2 | +++ postgresql-7.1/src/pl/plperl/Makefile.PL Sun May 6 16:07:33 2001 | |
3 | @@ -80,11 +80,3 @@ | |
4 | $inherited; | |
5 | } | |
6 | ||
7 | -sub MY::install { | |
8 | - | |
9 | -qq[ | |
10 | -install :: all | |
11 | - cp \$(INST_DYNAMIC) \$(DESTDIR)$ENV{plperl_installdir} | |
12 | -]; | |
13 | - | |
14 | -} | |
15 | --- postgresql-7.1/src/interfaces/perl5/Makefile.PL~ Fri Mar 16 22:50:44 2001 | |
16 | +++ postgresql-7.1/src/interfaces/perl5/Makefile.PL Sun May 6 16:25:44 2001 | |
17 | @@ -53,14 +53,3 @@ | |
18 | ||
19 | WriteMakefile(%opts); | |
20 | ||
21 | - | |
22 | -sub MY::installbin { | |
23 | - | |
24 | -q[ | |
25 | -# Create a target that can be used to | |
26 | -# determine the Perl install directory. | |
27 | -echo-installdir: | |
28 | - @echo $(INSTALLSITELIB) | |
29 | -]; | |
30 | - | |
31 | -} | |
32 | --- postgresql-7.1/src/interfaces/perl5/GNUmakefile~ Sun May 6 16:26:11 2001 | |
33 | +++ postgresql-7.1/src/interfaces/perl5/GNUmakefile Sun May 6 16:37:49 2001 | |
34 | @@ -35,21 +35,7 @@ | |
35 | # installation directory somewhere. | |
36 | ||
37 | install: Makefile | |
38 | - $(MAKE) -f Makefile clean | |
39 | - POSTGRES_LIB="$(libdir)" \ | |
40 | - POSTGRES_INCLUDE="$(includedir)" \ | |
41 | - $(PERL) $(srcdir)/Makefile.PL | |
42 | - $(MAKE) -f Makefile all | |
43 | - -@if [ -w "`$(MAKE) --quiet -f Makefile DESTDIR=\"$(DESTDIR)\" echo-installdir`" ]; then \ | |
44 | - $(MAKE) -f Makefile DESTDIR=\"$(DESTDIR)\" install; \ | |
45 | - $(MAKE) clean; \ | |
46 | - else \ | |
47 | - echo "*****" ;\ | |
48 | - echo "* Skipping the installation of the Perl module for lack of permissions."; \ | |
49 | - echo "* To install it, change to the directory "`pwd`","; \ | |
50 | - echo "* become the appropriate user, and do \`$(MAKE) install'."; \ | |
51 | - echo "*****"; \ | |
52 | - fi | |
53 | + $(MAKE) -f Makefile DESTDIR=\"$(DESTDIR)\" install | |
54 | ||
55 | ||
56 | uninstall: | |
57 | --- postgresql-7.1/src/interfaces/python/GNUmakefile~ Sun May 6 16:26:11 2001 | |
58 | +++ postgresql-7.1/src/interfaces/python/GNUmakefile Sun May 6 16:43:25 2001 | |
59 | @@ -35,7 +35,7 @@ | |
60 | install: all | |
61 | @echo "Installing Python module" | |
62 | @if ( $(INSTALL_DATA) pg.py $(DESTDIR)$(python_moduledir) && \ | |
63 | - $(MAKE) -f Makefile LIBDIR=\"$(LIBDIR)\" install ); then : ; else \ | |
64 | + $(MAKE) -f Makefile LIBDIR=\"$(DESTDIR)/$(prefix)/lib\" install ); then : ; else \ | |
65 | echo "*****" ;\ | |
66 | echo "* Skipping the installation of the Python interface module for lack"; \ | |
67 | echo "* of permissions. To install it, change to the directory"; \ |