← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/include.am

  • Committer: Marisa Plumb
  • Date: 2011-03-17 16:32:26 UTC
  • mfrom: (2239 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2283.
  • Revision ID: marisa.plumb@gmail.com-20110317163226-x60oefuq1vnf0qx2
merging

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/include.am
98
98
examples_sqlite_server_SOURCES= examples/sqlite_server.c
99
99
endif
100
100
 
101
 
nobase_dist_include_HEADERS+= \
 
101
nobase_dist_libdrizzleinclude_HEADERS= \
102
102
        libdrizzle/column.h \
103
103
        libdrizzle/column_client.h \
104
104
        libdrizzle/column_server.h \
143
143
install-libdrizzle:
144
144
        test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
145
145
        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle/libdrizzle.la "$(DESTDIR)$(libdir)"
146
 
        test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
147
 
        @list='$(nobase_dist_include_HEADERS)'; test -n "$(includedir)" || list=; \
 
146
        test -z "$(libdrizzleincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libdrizzleincludedir)"
 
147
        @list='$(nobase_dist_libdrizzleinclude_HEADERS)'; test -n "$(libdrizzleincludedir)" || list=; \
148
148
        $(am__nobase_list) | while read dir files; do \
149
149
          if test "x$$dir" = "xlibdrizzle" ; then \
150
150
            xfiles=; for file in $$files; do \
152
152
              else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
153
153
            test -z "$$xfiles" || { \
154
154
              test "x$$dir" = x. || { \
155
 
                echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
156
 
                $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
157
 
              echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
158
 
              $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
 
155
                echo "$(MKDIR_P) '$(DESTDIR)$(libdrizzleincludedir)/$$dir'"; \
 
156
                $(MKDIR_P) "$(DESTDIR)$(libdrizzleincludedir)/$$dir"; }; \
 
157
              echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(libdrizzleincludedir)/$$dir'"; \
 
158
              $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(libdrizzleincludedir)/$$dir" || exit $$?; }; \
159
159
          fi; \
160
160
        done