← Back to branch summary

~ubuntu-branches/ubuntu/utopic/postgresql-9.1/utopic

« back to all changes in this revision

Viewing changes to src/makefiles/pgxs.mk

  • Committer: Package Import Robot
  • Author(s): Christoph Berg, Christoph Berg, Martin Pitt
  • Date: 2013-09-10 12:24:21 UTC
  • mfrom: (29.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20130910122421-87elzo0gs282alf6
Tags: 9.1.9-5
[ Christoph Berg ]
* Pull 82b0102650cf85268145a46f0ab488bacf6599a1 from upstream head to better
  support VPATH builds of PGXS modules, and make the install targets depend
  on installdirs.

[ Martin Pitt ]
* debian/rules: Still build the client-side libraries on Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/makefiles/pgxs.mk
122
122
        $(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
123
123
endif # PROGRAM
124
124
 
125
 
installcontrol: $(addsuffix .control, $(EXTENSION))
 
125
installcontrol: $(addsuffix .control, $(EXTENSION)) | installdirs
126
126
ifneq (,$(EXTENSION))
127
 
        $(INSTALL_DATA) $< '$(DESTDIR)$(datadir)/extension/'
 
127
        $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/extension/'
128
128
endif
129
129
 
130
 
installdata: $(DATA) $(DATA_built)
 
130
installdata: $(DATA) $(DATA_built) | installdirs
131
131
ifneq (,$(DATA)$(DATA_built))
132
132
        $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/$(datamoduledir)/'
133
133
endif
134
134
 
135
 
installdatatsearch: $(DATA_TSEARCH)
 
135
installdatatsearch: $(DATA_TSEARCH) | installdirs
136
136
ifneq (,$(DATA_TSEARCH))
137
137
        $(INSTALL_DATA) $^ '$(DESTDIR)$(datadir)/tsearch_data/'
138
138
endif
139
139
 
140
 
installdocs: $(DOCS)
 
140
installdocs: $(DOCS) | installdirs
141
141
ifdef DOCS
142
142
ifdef docdir
143
143
        $(INSTALL_DATA) $^ '$(DESTDIR)$(docdir)/$(docmoduledir)/'
144
144
endif # docdir
145
145
endif # DOCS
146
146
 
147
 
installscripts: $(SCRIPTS) $(SCRIPTS_built)
 
147
installscripts: $(SCRIPTS) $(SCRIPTS_built) | installdirs
148
148
ifdef SCRIPTS
149
149
        $(INSTALL_SCRIPT) $^ '$(DESTDIR)$(bindir)/'
150
150
endif # SCRIPTS