Skip to content

Commit

Permalink
Merge branch 'master' of github.com:sahlberg/libnfs
Browse files Browse the repository at this point in the history
  • Loading branch information
sahlberg committed Sep 19, 2011
2 parents 5a1f145 + 95b7217 commit 357f65c
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ libtool
ltmain.sh ltmain.sh
missing missing
stamp-h1 stamp-h1

!libnfs.pc.in
5 changes: 5 additions & 0 deletions Makefile.am
Original file line number Original file line Diff line number Diff line change
@@ -1,2 +1,7 @@
SUBDIRS = mount nfs portmap rquota lib include . $(MAYBE_EXAMPLES) SUBDIRS = mount nfs portmap rquota lib include . $(MAYBE_EXAMPLES)


pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnfs.pc

EXTRA_DIST = README COPYING libnfs.pc.in

2 changes: 1 addition & 1 deletion configure.ac
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ AC_CONFIG_FILES([Makefile]
[examples/Makefile] [examples/Makefile]
) )


AC_OUTPUT AC_OUTPUT([libnfs.pc])
14 changes: 14 additions & 0 deletions libnfs.pc.in
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,14 @@
# libnfs pkg-config file

prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@

Name: libnfs
Description: libnfs is a client library for accessing NFS shares over a network.
Version: @VERSION@
Requires:
Conflicts:
Libs: -L${libdir} -lnfs
Cflags: -I${includedir}
1 change: 1 addition & 0 deletions packaging/RPM/libnfs.spec.in
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ development libraries for LibNFS
%{_includedir}/nfsc/libnfs-raw-rquota.h %{_includedir}/nfsc/libnfs-raw-rquota.h
%{_libdir}/libnfs.a %{_libdir}/libnfs.a
%{_libdir}/libnfs.la %{_libdir}/libnfs.la
%{_libdir}/pkgconfig/libnfs.pc


%changelog %changelog
* Sun Jul 31 2011 : Version 1.0 * Sun Jul 31 2011 : Version 1.0
Expand Down

0 comments on commit 357f65c

Please sign in to comment.