[StGit PATCH] Fixed default install location

[StGit PATCH] Fixed default install location

[Daniel White]

Originally broken by addition of Debian package support.

Signed-off-by: Daniel White <daniel@whitehouse.id.au>
---

The default installation direction is actually /usr at present despite
what 'INSTALL' says.

The 'debian/rules' makefile specifies the prefix as /usr so doesn't
seem to depend on this. I've tested the resulting debian package and
everything is still installed correctly under /usr.

 setup.cfg |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 1eb8e9b..4359033 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
 [install]
-prefix: /usr
+prefix: ~
-- 
1.5.6.2

Re: [StGit PATCH] Fixed default install location

[Karl Hasselström]

On 2008-07-24 20:20:31 +1000, Daniel White wrote:

> Originally broken by addition of Debian package support.
>
> Signed-off-by: Daniel White <daniel@whitehouse.id.au>
> ---
>
> The default installation direction is actually /usr at present
> despite what 'INSTALL' says.
>
> The 'debian/rules' makefile specifies the prefix as /usr so doesn't
> seem to depend on this. I've tested the resulting debian package and
> everything is still installed correctly under /usr.

Looks correct to me; I'll queue it up in kha/stable. Catalin, do you
have any issues with it?

Those extra comments should have been part of the commit message,
though. I'll fix that.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: [StGit PATCH] Fixed default install location

[Catalin Marinas]

2008/7/24 Daniel White <daniel@whitehouse.id.au>:
> Originally broken by addition of Debian package support.
>
> Signed-off-by: Daniel White <daniel@whitehouse.id.au>
> ---
>
> The default installation direction is actually /usr at present despite
> what 'INSTALL' says.
>
> The 'debian/rules' makefile specifies the prefix as /usr so doesn't
> seem to depend on this. I've tested the resulting debian package and
> everything is still installed correctly under /usr.

I also use "python setup.py bdist_rpm" when releasing, I think it will
get confused by a different prefix.

-- 
Catalin

Re: [StGit PATCH] Fixed default install location

[Daniel White]

"Catalin Marinas" <catalin.marinas@gmail.com> wrote:
> 
> I also use "python setup.py bdist_rpm" when releasing, I think it will
> get confused by a different prefix.
> 

Not being familiar with distutils, I didn't even see that use case.

Regardless, the instructions are incorrect and the behaviour surprising.
When I installed this in a cygwin environment, it went on to clobber
my system directories.

Would it be more useful to have the Makefile handle the general case and
setup.py for more specialised cases, such as generating an rpm?

I've thrown some patches together that does some of this.  I can tidy
these up and put them in a public repository if this sounds like a
reasonable plan of attack.

-- 
Daniel White

Re: [StGit PATCH] Fixed default install location

[Catalin Marinas]

2008/7/27 Daniel White <daniel@whitehouse.id.au>:
> "Catalin Marinas" <catalin.marinas@gmail.com> wrote:
>>
>> I also use "python setup.py bdist_rpm" when releasing, I think it will
>> get confused by a different prefix.
>
> Not being familiar with distutils, I didn't even see that use case.

I use "python setup.py bdist_rpm", though passing --prefix would
probably fix it.

> Regardless, the instructions are incorrect and the behaviour surprising.
> When I installed this in a cygwin environment, it went on to clobber
> my system directories.
>
> Would it be more useful to have the Makefile handle the general case and
> setup.py for more specialised cases, such as generating an rpm?

I agree.

> I've thrown some patches together that does some of this.  I can tidy
> these up and put them in a public repository if this sounds like a
> reasonable plan of attack.

Yes, it is. Please base them on my (or Karl's) latest git tree as I
already merged this patch.

Thanks.

-- 
Catalin

[StGit RFC] Pull request for build/install work

[Daniel White]

Changes are on my experimental branch
at git://repo.or.cz/stgit/dwhite.git.

Fixed some old cruft causing problems when building/installing the
documentation and added new targets for streamlining the process.  The
end result being fairly similar to Git's install process.

Daniel White (7):
      Fix Makefile to correctly pass prefix option
      Remove variables regarding section 7 man pages
      Fix default install location for manpages
      Add install-doc target to makefile
      Add install-html target to makefile
      Remove installation of documentation from setup.py
      Updated INSTALL with documentation of Makefile

 Documentation/Makefile |   25 ++++++++++++-------------
 INSTALL                |   15 ++++++++++-----
 Makefile               |   12 +++++++++---
 setup.py               |    2 +-
 4 files changed, 32 insertions(+), 22 deletions(-)

-- 
Daniel White

Re: [StGit RFC] Pull request for build/install work

[Karl Hasselström]

On 2008-07-31 16:29:16 +1000, Daniel White wrote:

> Changes are on my experimental branch
> at git://repo.or.cz/stgit/dwhite.git.

Thanks. Have merged, and will push out sometime soon.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Re: [StGit RFC] Pull request for build/install work

[Catalin Marinas]

2008/8/4 Karl Hasselström <kha@treskal.com>:
> On 2008-07-31 16:29:16 +1000, Daniel White wrote:
>
>> Changes are on my experimental branch
>> at git://repo.or.cz/stgit/dwhite.git.
>
> Thanks. Have merged, and will push out sometime soon.

Thanks, both to Daniel and Karl (for merging them).

-- 
Catalin