[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Add support for make install DESTDIR=

From: Arkadiusz Miskiewicz <misiek_at_pld.ORG.PL>
Date: 2002-08-02 22:19:56 CEST

Jon Middleton <jjm@ixtab.org.uk> writes:

> On Mon, Jul 29, 2002 at 09:13:43PM +0100, Jon Middleton wrote:
> > Hello,
> >
> > Over the weekend I created an updated Debian package of subversion and
> > came across some problems with getting the build system to install
> > into the temporary area that is used to create the package.
> >
> > It would help anyone that creating a package if it was possible to
> > invoke make install as
> >
> > make install DESTDIR=debian/tmp
>
> The attched patch adds support for installing subversion into a
> different directory by adding DESTDIR to make install. Most of the
> patch is just adding $(DESTDIR) into the install paths.
I don't know why these DESTDIR patches are not applied. Even
without this...

> The largest change is to how axsp2 is called, I've added -S
> LIBEXECDIR=$(DESTDIR)$(APACHE_LIBEXECDIR) to install-mods-shared: and
> removed -a so that it doesn't try to modify httpd.conf, which is
> not in the modified path.

... change instead of having packages/rpm/install.patch
and using in packages/rpm/subversion.spec this ugly make install
rule:

make install \
        prefix=$RPM_BUILD_ROOT/usr \
        mandir=$RPM_BUILD_ROOT/usr/share/man \
        fs_libdir=$RPM_BUILD_ROOT/usr/lib \
        base_libdir=$RPM_BUILD_ROOT/usr/lib \
        infodir=$RPM_BUILD_ROOT/usr/share/info \
        libexecdir=$RPM_BUILD_ROOT/%{apache_dir}/lib

you could use in spec:

make install \
        INSTALL_MOD_SHARED=echo \
        DESTDIR=$RPM_BUILD_ROOT
install subversion/mod_dav_svn/.libs/*.so $RPM_BUILD_ROOT%{_apachelibdir}

much simpler, no need to patch anything.

> I'm currently thinking that the changes to axsp2 should be done as an
> option to configure (--enable-package-mode or --disable-mod-activate ?)
> to allow packagers to disable this activation.
>
> I'll have a look at doing this change tomorrow night if people think
> it's a worthy addition.
apxs is afaik still broken when httpd.conf is *directory* not file.

[root@arm misiek]# ls /etc/httpd/httpd.conf/
10_httpd.conf 50_mod_actions.conf 60_mod_expires.conf 65_mod_usertrack.conf
10_httpd.conf.rpmnew 51_mod_auth.conf 62_mod_headers.conf 66_mod_unique_id.conf
20_mod_vhost_alias.conf 59_mod_dir.conf 65_mod_dav_svn.conf 70_mod_php.conf
45_mod_dav.conf 59_mod_dir.conf.rpmnew 65_mod_dav_svn.conf.rpmnew

(ability to) disable it is good thing (tm) IMO.

> Jon

-- 
Arkadiusz Mi¶kiewicz   IPv6 ready PLD Linux at http://www.pld.org.pl
misiek(at)pld.org.pl   AM2-6BONE, 1024/3DB19BBD, arekm(at)ircnet, PWr
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Aug 2 22:54:08 2002

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.