diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2011-08-09 21:10:25 +0400 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2011-08-09 21:10:25 +0400 |
| commit | 178339e9638a0e02d8461185867b173f049ec2b2 (patch) | |
| tree | ab075ff9c16373a841fe860bbb237b5ec94c73dc | |
| parent | 9302b469b04a6fba174637ac5c27fbbbf3713c57 (diff) | |
| download | libatomic_ops-178339e9638a0e02d8461185867b173f049ec2b2.tar.gz | |
Fix commits 86e8b5 and 7bd1fd regarding "make install"
(fix paths for private header files and copy COPYING file).
* Makefile.am (dist_pkgdata_DATA): Add COPYING.
* src/Makefile.am (EXTRA_DIST): Add atomic_ops/sysdeps/README (move
from private_HEADERS).
* src/Makefile.am (privatedir): Fix path.
* src/Makefile.am (private_HEADERS): Make "nobase".
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 3c0dae4..606ba8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,4 +3,6 @@ SUBDIRS = src doc tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = atomic_ops.pc +dist_pkgdata_DATA = COPYING + #distclean-local: diff --git a/src/Makefile.am b/src/Makefile.am index 3b11a2a..a446571 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,13 +10,13 @@ endif libatomic_ops_gpl_a_SOURCES = atomic_ops_stack.c atomic_ops_malloc.c -EXTRA_DIST=Makefile.msft \ +EXTRA_DIST=Makefile.msft atomic_ops/sysdeps/README \ atomic_ops/generalize-small.template atomic_ops/sysdeps/sunc/sparc.S #Private Headers -privatedir=${includedir}/atomic_ops/ -private_HEADERS=atomic_ops/generalize.h atomic_ops/generalize-small.h \ - atomic_ops/sysdeps/README \ +privatedir=${includedir}/ +nobase_private_HEADERS=atomic_ops/generalize.h atomic_ops/generalize-small.h \ + \ atomic_ops/sysdeps/acquire_release_volatile.h \ atomic_ops/sysdeps/aligned_atomic_load_store.h \ atomic_ops/sysdeps/all_acquire_release_volatile.h \ |