Changeset 5992131


Ignore:
Timestamp:
Jun 28, 2010, 9:47:57 PM (14 years ago)
Author:
Jessica B. Hamrick <jhamrick@…>
Branches:
debian
Children:
f0a1232
Parents:
8120872 (diff), fad0d1b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jessica B. Hamrick <jhamrick@…> (06/28/10 21:47:57)
git-committer:
Jessica B. Hamrick <jhamrick@…> (06/28/10 21:47:57)
Message:

Merge branch 'master' of github.com:jhamrick/gutenbach into debian

Conflicts:

.gitignore

Files:
33 added
4 edited

Legend:

Unmodified
Added
Removed
  • client/Makefile

    r30beeab r4be9aa2  
    44        mkdir -p $(DESTDIR)/usr/bin/
    55        install -m 755 bin/* $(DESTDIR)/usr/bin/
     6        gzip < bin/gbq.1 > bin/gbq.1.gz
     7        gzip < bin/gbr.1 > bin/gbr.1.gz
     8        gzip < bin/gbrm.1 > bin/gbrm.1.gz
     9        gzip < bin/gutenbach-client-config.1 > bin/gutenbach-client-config.1.gz
     10        mkdir -p $(DESTDIR)/usr/share/man/man1/
     11        install -m 755 bin/*.1.gz $(DESTDIR)/usr/share/man/man1/
     12
     13clean:
     14        rm bin/*.1.gz
  • queue/Makefile

    r9c0279e rfad0d1b  
    44        mkdir -p $(DESTDIR)/usr/lib/gutenbach/queue/
    55        install -m 755 lib/* $(DESTDIR)/usr/lib/gutenbach/queue/
     6
     7clean:
  • remctl/Makefile

    r9c0279e rfad0d1b  
    66        install -m 755 lib/gutenbach/* $(DESTDIR)/usr/lib/gutenbach/remctl/
    77        install -m 755 lib/remctl/* $(DESTDIR)/etc/remctl/conf.d/
     8
     9clean:
  • server/Makefile

    r9c0279e rfad0d1b  
    99        install -m 755 inst/* $(DESTDIR)/usr/lib/gutenbach/inst/
    1010        install -m 755 rm/* $(DESTDIR)/usr/lib/gutenbach/rm/
     11
     12clean:
Note: See TracChangeset for help on using the changeset viewer.