Jeremy C. Reed
2006-Sep-20 19:10 UTC
[Fontconfig] fix Makefile.am: Create one directory at a time
Please consider the following patch. This is from joerg of NetBSD in the pkgsrc collection with its log message of "Create one directory at a time, Solaris install doesn''t like multiple arguments." (The patch in pkgsrc is for Makefile.in so I redid for Makefile.am.) diff --git a/Makefile.am b/Makefile.am index 88e55af..e0b372a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,7 +85,8 @@ ChangeLog: $(srcdir)/ChangeLog .PHONY: ChangeLog $(srcdir)/ChangeLog install-data-local: - $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) + $(mkinstalldirs) $(DESTDIR)$(configdir) + $(mkinstalldirs) $(DESTDIR)$(fc_cachedir) if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \ echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \ mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \ If you want me to commit this, tell me and I will try. I am still learning git.
Keith Packard
2006-Sep-20 23:43 UTC
[Fontconfig] fix Makefile.am: Create one directory at a time
On Wed, 2006-09-20 at 21:08 -0500, Jeremy C. Reed wrote:> Please consider the following patch. > > This is from joerg of NetBSD in the pkgsrc collection with its log message > of "Create one directory at a time, Solaris install doesn''t like multiple > arguments." > > (The patch in pkgsrc is for Makefile.in so I redid for Makefile.am.) > > diff --git a/Makefile.am b/Makefile.am > index 88e55af..e0b372a 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -85,7 +85,8 @@ ChangeLog: $(srcdir)/ChangeLog > .PHONY: ChangeLog $(srcdir)/ChangeLog > > install-data-local: > - $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) > + $(mkinstalldirs) $(DESTDIR)$(configdir) > + $(mkinstalldirs) $(DESTDIR)$(fc_cachedir) > if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \ > echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \ > mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \ > > > If you want me to commit this, tell me and I will try. I am still learning > git.Please feel free to give it a whirl; if you don''t have direct commit access to the fontconfig repository, go ahead and just publish your own repository with the patch in place; doing a git-pull is *far* easier than applying patches by hand (although the above patch is certainly trivial enough). -- keith.packard@intel.com -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://lists.freedesktop.org/archives/fontconfig/attachments/20060920/275bf118/attachment.pgp
Jeremy C. Reed
2006-Sep-21 07:26 UTC
[Fontconfig] fix Makefile.am: Create one directory at a time
On Wed, 20 Sep 2006, Keith Packard wrote:> > If you want me to commit this, tell me and I will try. I am still learning > > git. > > Please feel free to give it a whirl; if you don''t have direct commit > access to the fontconfig repository, go ahead and just publish your own > repository with the patch in place; doing a git-pull is *far* easier > than applying patches by hand (although the above patch is certainly > trivial enough).Done. Now I need to figure out GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL. And my email address was wrong in the log, but that is okay.
Jeremy C. Reed
2006-Oct-17 08:27 UTC
[Fontconfig] fix Makefile.am: Create one directory at a time
> On Wed, 20 Sep 2006, Keith Packard wrote: > > > > If you want me to commit this, tell me and I will try. I am still learning > > > git. > > > > Please feel free to give it a whirl; if you don''t have direct commit > > access to the fontconfig repository, go ahead and just publish your own > > repository with the patch in place; doing a git-pull is *far* easier > > than applying patches by hand (although the above patch is certainly > > trivial enough). > > Done. > > Now I need to figure out GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, > GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL. And my email > address was wrong in the log, but that is okay.Well I realize I did it wrong. It was only committed in my own tree but no pushed to origin. I have: $ head -1 .git/remotes/origin URL: git+ssh://git.freedesktop.org/git/fontconfig/ $ git-rev-list origin..HEAD 9554733ab05bcf17ab465175049609e9508e6160 And git-show of that shows my update that never got pushed: diff-tree 9554733ab05bcf17ab465175049609e9508e6160 (from 0596d7296c94b2bb9817338b8c1a76da91673fb9) Author: Jeremy C. Reed <reed@glacier.reedmedia.net> Date: Thu Sep 21 08:56:50 2006 -0500 Create one directory at time with mkinstalldirs. Solaris install doesn''t like multiple arguments. (From NetBSD pkgsrc.) diff --git a/Makefile.am b/Makefile.am index 88e55af..e0b372a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,7 +85,8 @@ ChangeLog: $(srcdir)/ChangeLog .PHONY: ChangeLog $(srcdir)/ChangeLog install-data-local: - $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir) + $(mkinstalldirs) $(DESTDIR)$(configdir) + $(mkinstalldirs) $(DESTDIR)$(fc_cachedir) if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \ echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \ mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \ I ran "git push origin" and it failed with: $ git push origin updating ''refs/heads/master'' from 0596d7296c94b2bb9817338b8c1a76da91673fb9 to 9554733ab05bcf17ab465175049609e9508e6160 Generating pack... Done counting 5 objects. Result has 3 objects. Deltifying 3 objects. 100% (3/3) done Total 3, written 3 (delta 2), reused 0 (delta 0) Unpacking 3 objects unable to create temporary sha1 filename ./objects/obj_CgzAF5: Permission denied fatal: failed to write object unpack unpacker exited with error code ng refs/heads/master n/a (unpacker error) Does this mean that "reed" doesn''t have permission on the git server to write to it?