Skip to content

Commit

Permalink
install include headers with make install (Closes: #47)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mario Limonciello committed May 7, 2018
1 parent cec1bd0 commit ec86866
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 5 deletions.
1 change: 1 addition & 0 deletions Makefile.am
Expand Up @@ -40,6 +40,7 @@ include src/python/Makefile.am
include src/py-cli/Makefile.am
include src/bin/Makefile.am
include src/pyunit/Makefile.am
include src/include/Makefile.am

pkgconfdir=$(sysconfdir)/$(PACKAGE)
if HAVE_PYTHON
Expand Down
2 changes: 1 addition & 1 deletion pkg/debian/libsmbios-dev.install
@@ -1,4 +1,4 @@
debian/tmp/usr/lib/*/libsmbios_c.so
debian/tmp/usr/lib/*/libsmbios_c.a
src/include usr
debian/tmp/usr/include/* usr/include/
debian/tmp/usr/lib/*/pkgconfig/
4 changes: 0 additions & 4 deletions pkg/libsmbios.spec.in
Expand Up @@ -194,10 +194,7 @@ mkdir %{buildroot}
cd _build
TOPDIR=..
make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
mkdir -p %{buildroot}/%{_includedir}
mkdir -p %{buildroot}/%{_bindir}
cp -a $TOPDIR/src/include/* %{buildroot}/%{_includedir}/
cp -a out/public-include/* %{buildroot}/%{_includedir}/
rm -f %{buildroot}/%{_libdir}/libsmbios*.*a
find %{buildroot}/%{_includedir} out/libsmbios_c -exec touch -r $TOPDIR/configure.ac {} \;

Expand Down Expand Up @@ -267,7 +264,6 @@ rm -rf %{buildroot}
%files -n libsmbios-devel -f _build/buildlogs.txt
%defattr(-,root,root,-)
%doc COPYING-GPL COPYING-OSL src/bin/getopts_LICENSE.txt
%{_includedir}/smbios
%{_includedir}/smbios_c
%{_libdir}/libsmbios_c.so
%{_libdir}/pkgconfig/*.pc
Expand Down
38 changes: 38 additions & 0 deletions src/include/Makefile.am
@@ -0,0 +1,38 @@
smbios_cdir = $(includedir)/smbios_c
smbios_c_HEADERS = \
src/include/smbios_c/cmos.h \
src/include/smbios_c/memory.h \
src/include/smbios_c/smbios.h \
src/include/smbios_c/token.h \
src/include/smbios_c/compat.h \
src/include/smbios_c/types.h \
src/include/smbios_c/smi.h \
src/include/smbios_c/system_info.h

smbios_c_configdir = $(includedir)/smbios_c/config
smbios_c_config_HEADERS = \
src/include/smbios_c/config/suffix.h \
src/include/smbios_c/config/auto_link.h \
src/include/smbios_c/config/select_platform_config.h \
src/include/smbios_c/config/abi_suffix.h \
src/include/smbios_c/config/user.h \
src/include/smbios_c/config/select_compiler_config.h \
src/include/smbios_c/config/abi/msvc_prefix.h \
src/include/smbios_c/config/abi/msvc_suffix.h \
src/include/smbios_c/config/platform/win64.h \
src/include/smbios_c/config/platform/win32.h \
src/include/smbios_c/config/platform/linux.h \
src/include/smbios_c/config/abi_prefix.h \
src/include/smbios_c/config/get_config.h \
src/include/smbios_c/config/compiler/sunpro_cc.h \
src/include/smbios_c/config/compiler/visualc.h \
src/include/smbios_c/config/compiler/gcc.h

smbios_c_objdir = $(includedir)/smbios_c/obj
smbios_c_obj_HEADERS = \
src/include/smbios_c/obj/cmos.h \
src/include/smbios_c/obj/memory.h \
src/include/smbios_c/obj/smbios.h \
src/include/smbios_c/obj/token.h \
src/include/smbios_c/obj/smi.h

0 comments on commit ec86866

Please sign in to comment.