| Message ID | 20110822173456.GA14284@rox.home.comstyle.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Aug 22, 2011 at 01:34:57PM -0400, Brad wrote: > On Sat, Aug 13, 2011 at 05:23:57PM -0400, Brad wrote: > > libcacard: use INSTALL_DATA for data > > > > Signed-off-by: Brad Smith <brad@comstyle.com> > > > > --- > > libcacard/Makefile | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/libcacard/Makefile b/libcacard/Makefile > > index 5cd7594..fe9747a 100644 > > --- a/libcacard/Makefile > > +++ b/libcacard/Makefile > > @@ -54,7 +54,7 @@ install-libcacard: libcacard.pc libcacard.la vscclient > > $(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)" > > $(INSTALL_DIR) "$(DESTDIR)$(bindir)" > > libtool --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)" > > - libtool --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)" > > + libtool --mode=install $(INSTALL_DATA) libcacard.la "$(DESTDIR)$(libdir)" > > libtool --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig" > > for inc in *.h; do \ > > libtool --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ > > -- > > 1.7.6 > > An updated diff against up to date master. > > > libcacard: use INSTALL_DATA for data > > Signed-off-by: Brad Smith <brad@comstyle.com> > > --- > libcacard/Makefile | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Thanks, applied to the trivial patches tree: http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches Stefan
On Fri, Sep 02, 2011 at 11:10:32AM +0100, Stefan Hajnoczi wrote: > On Mon, Aug 22, 2011 at 01:34:57PM -0400, Brad wrote: > > On Sat, Aug 13, 2011 at 05:23:57PM -0400, Brad wrote: > > > libcacard: use INSTALL_DATA for data > > > > > > Signed-off-by: Brad Smith <brad@comstyle.com> > > > > > > --- > > > libcacard/Makefile | 2 +- > > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > > > diff --git a/libcacard/Makefile b/libcacard/Makefile > > > index 5cd7594..fe9747a 100644 > > > --- a/libcacard/Makefile > > > +++ b/libcacard/Makefile > > > @@ -54,7 +54,7 @@ install-libcacard: libcacard.pc libcacard.la vscclient > > > $(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)" > > > $(INSTALL_DIR) "$(DESTDIR)$(bindir)" > > > libtool --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)" > > > - libtool --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)" > > > + libtool --mode=install $(INSTALL_DATA) libcacard.la "$(DESTDIR)$(libdir)" > > > libtool --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig" > > > for inc in *.h; do \ > > > libtool --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ > > > -- > > > 1.7.6 > > > > An updated diff against up to date master. > > > > > > libcacard: use INSTALL_DATA for data > > > > Signed-off-by: Brad Smith <brad@comstyle.com> > > > > --- > > libcacard/Makefile | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > Thanks, applied to the trivial patches tree: > http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches > Thanks, my bad for not doing a pull request. > Stefan >
diff --git a/libcacard/Makefile b/libcacard/Makefile index b3f5e6c..bd7b3e6 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -56,7 +56,7 @@ install-libcacard: libcacard.pc libcacard.la vscclient $(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)" $(INSTALL_DIR) "$(DESTDIR)$(bindir)" $(LIBTOOL) --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)" - $(LIBTOOL) --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)" + $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.la "$(DESTDIR)$(libdir)" $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig" for inc in *.h; do \ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \