Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit840306a

Browse files
committed
ecpg.patch (wrong makefile expansion in some cases) the ecpg Makefiles use a variable DESTDIR which is never defined except by debian/rules makefile, in which case the ecpg makefiles expand wrong pathnames. If we want to support a DESTDIR root it must be done consistently in all the makefiles, not just in ecpg.From: Massimo Dal Zotto <dz@cs.unitn.it>
1 parentbf1dd3e commit840306a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

‎src/interfaces/ecpg/include/Makefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ all clean::
66
@echo Nothing to be done.
77

88
install::
9-
$(INSTALL)$(INSTLOPTS) ecpgerrno.h$(DESTDIR)$(HEADERDIR)
10-
$(INSTALL)$(INSTLOPTS) ecpglib.h$(DESTDIR)$(HEADERDIR)
11-
$(INSTALL)$(INSTLOPTS) ecpgtype.h$(DESTDIR)$(HEADERDIR)
12-
$(INSTALL)$(INSTLOPTS) sqlca.h$(DESTDIR)$(HEADERDIR)
9+
$(INSTALL)$(INSTLOPTS) ecpgerrno.h$(HEADERDIR)
10+
$(INSTALL)$(INSTLOPTS) ecpglib.h$(HEADERDIR)
11+
$(INSTALL)$(INSTLOPTS) ecpgtype.h$(HEADERDIR)
12+
$(INSTALL)$(INSTLOPTS) sqlca.h$(HEADERDIR)
1313

1414
uninstall::
15-
rm -f$(DESTDIR)$(HEADERDIR)/ecpgerrno.h
16-
rm -f$(DESTDIR)$(HEADERDIR)/ecpglib.h
17-
rm -f$(DESTDIR)$(HEADERDIR)/ecpgtype.h
18-
rm -f$(DESTDIR)$(HEADERDIR)/sqlca.h
15+
rm -f$(HEADERDIR)/ecpgerrno.h
16+
rm -f$(HEADERDIR)/ecpglib.h
17+
rm -f$(HEADERDIR)/ecpgtype.h
18+
rm -f$(HEADERDIR)/sqlca.h
1919

2020
depdepend:

‎src/interfaces/ecpg/preproc/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PATCHLEVEL=0
77

88
CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION)\
99
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL)\
10-
-DINCLUDE_PATH=\"$(DESTDIR)$(HEADERDIR)\"
10+
-DINCLUDE_PATH=\"$(HEADERDIR)\"
1111

1212
OBJ=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o ../../../backend/parser/scansup.o\
1313
keywords.o c_keywords.o ../lib/typename.o
@@ -27,10 +27,10 @@ clean:
2727
# to ship those files in the distribution, for people with inadequate tools.
2828

2929
install: all
30-
$(INSTALL)$(INSTL_EXE_OPTS) ecpg$(X)$(DESTDIR)$(BINDIR)
30+
$(INSTALL)$(INSTL_EXE_OPTS) ecpg$(X)$(BINDIR)
3131

3232
uninstall:
33-
rm -f$(DESTDIR)$(BINDIR)/ecpg
33+
rm -f$(BINDIR)/ecpg
3434

3535
# Rule that really do something.
3636
ecpg:$(OBJ)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp