Fix header installation.

loongson-zjl · Mar 8, 2012 · 20a1ca8 · 20a1ca8
1 parent 7ec2ad9
commit 20a1ca8
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git a/buildsys.mk.in b/buildsys.mk.in
@@ -21,7 +21,7 @@
 #  POSSIBILITY OF SUCH DAMAGE.
 #
 
-PACKAGE = @PACKAGE@
+PACKAGE = @PACKAGE_NAME@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@

diff --git a/configure b/configure
@@ -604,7 +604,6 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-PACKAGE
 TERM_SETAF6
 TERM_SETAF4
 TERM_SETAF3

diff --git a/configure.ac b/configure.ac
@@ -115,7 +115,7 @@ AC_SUBST(EXAMPLES_BUILD)
 BUILDSYS_INIT
 BUILDSYS_TOUCH_DEPS
 
-AC_SUBST(PACKAGE)
+AC_SUBST(PACKAGE_NAME)
 
 AC_CONFIG_FILES([buildsys.mk extra.mk libmowgli-2.pc])
 AC_OUTPUT

diff --git a/src/libmowgli/atomic/Makefile b/src/libmowgli/atomic/Makefile
@@ -7,9 +7,9 @@ SRCS = spinlock.c
 
 INCLUDES = atomic.h spinlock.h
 
-includesubdir = $(PACKAGE)/atomic
-
 include ../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/atomic
+
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/base/Makefile b/src/libmowgli/base/Makefile
@@ -19,9 +19,9 @@ INCLUDES = argstack.h		\
 	   random.h		\
 	   mowgli_signal.h
 
-includesubdir = $(PACKAGE)/base
-
 include ../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/base
+
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/container/Makefile b/src/libmowgli/container/Makefile
@@ -13,9 +13,9 @@ INCLUDES = list.h	\
 	   index.h	\
 	   patricia.h
 
-includesubdir = $(PACKAGE)/container
-
 include ../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/container
+
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/core/Makefile b/src/libmowgli/core/Makefile
@@ -25,9 +25,9 @@ INCLUDES = init.h		\
 	   stdinc.h		\
 	   process.h
 
-includesubdir = $(PACKAGE)/core
-
 include ../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/core
+
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/eventloop/Makefile b/src/libmowgli/eventloop/Makefile
@@ -7,9 +7,9 @@ SRCS = eventloop.c helper.c pollable.c timer.c null_pollops.c poll_pollops.c epo
 
 INCLUDES = eventloop.h
 
-includesubdir = $(PACKAGE)/eventloop
-
 include ../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/eventloop
+
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/ext/Makefile b/src/libmowgli/ext/Makefile
@@ -15,9 +15,9 @@ INCLUDES = confparse.h			\
 	   global_storage.h		\
 	   program_opts.h
 
-includesubdir = $(PACKAGE)/ext
-
 include ../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/ext
+
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/module/Makefile b/src/libmowgli/module/Makefile
@@ -7,9 +7,9 @@ SRCS = loader_${LIBMOWGLI_OS}.c
 
 INCLUDES = module.h
 
-includesubdir = $(PACKAGE)/module
-
 include ../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/module
+
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/object/Makefile b/src/libmowgli/object/Makefile
@@ -13,9 +13,9 @@ INCLUDES = object.h	\
 	   message.h	\
 	   metadata.h
 
-includesubdir = $(PACKAGE)/object
-
 include ../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/object
+
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/platform/Makefile b/src/libmowgli/platform/Makefile
@@ -2,7 +2,8 @@ SUBDIRS = win32
 
 INCLUDES = constructor.h
 
+include ../../../buildsys.mk
+
 includesubdir = $(PACKAGE)/platform
 
-include ../../../buildsys.mk
 include ../../../extra.mk
diff --git a/src/libmowgli/platform/win32/Makefile b/src/libmowgli/platform/win32/Makefile
@@ -7,9 +7,9 @@ SRCS = fork.c gettimeofday.c pipe.c setenv.c
 
 INCLUDES = win32_stdinc.h
 
-includesubdir = $(PACKAGE)/platform/win32
-
 include ../../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/platform/win32
+
 CPPFLAGS += -I. -I.. -I../.. -I../../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/thread/Makefile b/src/libmowgli/thread/Makefile
@@ -11,9 +11,9 @@ SRCS = mutex.c			\
 
 INCLUDES = thread.h
 
-includesubdir = $(PACKAGE)/thread
-
 include ../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/thread
+
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE
 
diff --git a/src/libmowgli/vio/Makefile b/src/libmowgli/vio/Makefile
@@ -7,9 +7,9 @@ SRCS = vio.c vio-openssl.c
 
 INCLUDES = vio.h vio-types.h
 
-includesubdir = $(PACKAGE)/vio
-
 include ../../../buildsys.mk
 
+includesubdir = $(PACKAGE)/vio
+
 CPPFLAGS += -I. -I.. -I../../.. -DMOWGLI_CORE