bug#8543: 23.3; glib include path mangled

[Reuben Thomas]

Building emacs-23 from bzr, I find the following oddity: C_SWITCH_XSITE
in the top-level Makefile comes out, correctly, as

C_SWITCH_X_SITE= -pthread -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 
-I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 
-I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/freetype2 
-I/usr/include/libpng12 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include 
-I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pixman-1   
-I/usr/include/freetype2 

but in src/Makefile, ALL_CFLAGS is mangled (search for /usr/lib/1):

ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} -D_BSD_SOURCE 
-pthread -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 
-I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/1 
-linux-gnu/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 
-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/cairo 
-I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 
${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} 
-I/usr/include/freetype2 ${DEPFLAGS}

I can’t see where this happens yet; I was hoping it would be obvious to
someone who knows the build system.


In GNU Emacs 23.3.2 (i686-pc-linux-gnu, GTK+ Version 2.22.0)
 of 2011-03-02 on canta
Windowing system distributor `The X.Org Foundation', version 11.0.11001000
Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: en_GB.utf8
  value of $XMODIFIERS: nil
  locale-coding-system: utf-8-unix
  default enable-multibyte-characters: t

Major mode: CSS

Minor modes in effect:
  shell-dirtrack-mode: t
  nxhtml-tag-do-also: t
  popcmp-group-alternatives: t
  popcmp-short-help-beside-alts: t
  rngalt-minimal-validation-header: t
  rngalt-display-validation-header: t
  flyspell-mode: t
  recentf-mode: t
  show-paren-mode: t
  savehist-mode: t
  minibuffer-electric-default-mode: t
  iswitchb-mode: t
  icomplete-mode: t
  global-whitespace-mode: t
  global-auto-revert-mode: t
  as-external-mode: t
  desktop-save-mode: t
  nxhtml-menu-mode: t
  mouse-wheel-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  column-number-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
<up> <up> <up> <up> <up> <up> C-s p a s v C-a C-] C-] 
C-] C-] C-] C-] C-] M-x c u s t o m i z e - g r o u 
p <return> a n g <tab> <return> C-s p a s s i <help-echo> 
<down-mouse-1> <mouse-1> <help-echo> <down-mouse-1> 
C-x C-f <up> <return> C-x C-f <up> <up> <up> <return> 
M-> M-< C-x C-f C-g M-> M-< C-x C-f M-r s t y l e s 
. c s s <return> M-r <return> M-r <return> M-r <return> 
C-g C-x C-f <M-backspace> <M-backspace> <M-backspace> 
<M-backspace> <tab> <return> C-n <return> C-n <return> 
C-p C-p C-n <return> C-p C-p <return> C-p C-p C-n C-p 
<return> C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n 
C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n 
C-n C-n C-n C-n <return> C-n C-n C-n C-n C-p C-p C-p 
<return> C-n C-n <return> C-n C-n C-n C-n C-n <return> 
C-s f o o t C-s C-s C-s C-s C-s C-s C-a C-x k <return> 
C-n C-n C-n C-n <return> C-s f o o t e r C-a C-s C-s 
C-s C-s C-s C-s C-a C-n C-n C-n C-SPC C-n C-n C-w C-_ 
C-x b a d l <backspace> <backspace> l d i s c . c s 
s <return> C-s f o o t e r - w r a p p e r C-a C-x 
b C-g C-x b <return> C-n C-n C-n C-n C-n C-n C-n C-n 
C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n 
C-n C-n C-n C-n C-n C-n C-n C-x b <return> C-n C-n 
C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n C-n 
M-x r e p o r t - e m <tab> <return>

Recent messages:
Doing CD...done
Listing /aldi2539@ftp.aldisc.com:/themes/bartik/css/...done
Retrieving layout.css...done
Mark saved where search started
Retrieving style.css...done
Mark saved where search started [2 times]
Mark set
Undo!
Mark saved where search started
Quit

Load-path shadows:
/home/rrt/local/share/emacs/nxhtml/util/rnc-mode hides 
/usr/share/emacs-snapshot/site-lisp/rnc-mode/rnc-mode
/home/rrt/local/share/emacs/nxhtml/related/php-mode hides 
/home/rrt/local/share/emacs/site-lisp/php-mode
/home/rrt/local/share/emacs/nxhtml/util/tabkey2 hides 
/home/rrt/local/share/emacs/site-lisp/tabkey2
/home/rrt/local/share/emacs/nxhtml/related/csharp-mode hides 
/home/rrt/local/share/emacs/site-lisp/csharp-mode
/home/rrt/local/share/emacs/site-lisp/popup hides 
/usr/local/share/emacs/23.3/site-lisp/auto-complete/popup
/home/rrt/local/share/emacs/site-lisp/fuzzy hides 
/usr/local/share/emacs/23.3/site-lisp/auto-complete/fuzzy
/home/rrt/.emacs.d/elpa/dictionary-1.8.7/link hides 
/usr/local/share/emacs/23.3/site-lisp/dictionary-el/link
/home/rrt/.emacs.d/elpa/dictionary-1.8.7/connection hides 
/usr/local/share/emacs/23.3/site-lisp/dictionary-el/connection
/home/rrt/.emacs.d/elpa/dictionary-1.8.7/dictionary-init hides 
/usr/local/share/emacs/23.3/site-lisp/dictionary-el/dictionary-init
/home/rrt/.emacs.d/elpa/dictionary-1.8.7/dictionary hides 
/usr/local/share/emacs/23.3/site-lisp/dictionary-el/dictionary
/home/rrt/local/share/emacs/site-lisp/graphviz-dot-mode hides 
/usr/local/share/emacs/23.3/site-lisp/emacs-goodies-el/graphviz-dot-mode
/home/rrt/local/share/emacs/site-lisp/dict hides 
/usr/local/share/emacs/23.3/site-lisp/emacs-goodies-el/dict
/usr/local/share/emacs/23.3/site-lisp/css-mode/css-mode hides 
/usr/local/share/emacs/23.3/lisp/textmodes/css-mode
/usr/share/emacs-snapshot/site-lisp/ruby1.8-elisp/ruby-mode hides 
/usr/local/share/emacs/23.3/lisp/progmodes/ruby-mode
/usr/local/share/emacs/23.3/site-lisp/css-mode/css-mode hides 
/usr/share/emacs/site-lisp/css-mode/css-mode
/usr/local/share/emacs/23.3/site-lisp/auctex/tex-info hides 
/usr/share/emacs/site-lisp/auctex/tex-info
/usr/local/share/emacs/23.3/site-lisp/auctex/context-nl hides 
/usr/share/emacs/site-lisp/auctex/context-nl
/usr/local/share/emacs/23.3/site-lisp/auctex/context-en hides 
/usr/share/emacs/site-lisp/auctex/context-en
/usr/local/share/emacs/23.3/site-lisp/auctex/latex hides 
/usr/share/emacs/site-lisp/auctex/latex
/usr/local/share/emacs/23.3/site-lisp/auctex/tex-mik hides 
/usr/share/emacs/site-lisp/auctex/tex-mik
/usr/local/share/emacs/23.3/site-lisp/auctex/tex-buf hides 
/usr/share/emacs/site-lisp/auctex/tex-buf
/usr/local/share/emacs/23.3/site-lisp/auctex/tex-jp hides 
/usr/share/emacs/site-lisp/auctex/tex-jp
/usr/local/share/emacs/23.3/site-lisp/auctex/tex-bar hides 
/usr/share/emacs/site-lisp/auctex/tex-bar
/usr/local/share/emacs/23.3/site-lisp/auctex/tex hides 
/usr/share/emacs/site-lisp/auctex/tex
/usr/local/share/emacs/23.3/site-lisp/auctex/multi-prompt hides 
/usr/share/emacs/site-lisp/auctex/multi-prompt
/usr/local/share/emacs/23.3/site-lisp/auctex/tex-fptex hides 
/usr/share/emacs/site-lisp/auctex/tex-fptex
/usr/local/share/emacs/23.3/site-lisp/auctex/tex-font hides 
/usr/share/emacs/site-lisp/auctex/tex-font
/usr/local/share/emacs/23.3/site-lisp/auctex/tex-fold hides 
/usr/share/emacs/site-lisp/auctex/tex-fold
/usr/local/share/emacs/23.3/site-lisp/auctex/texmathp hides 
/usr/share/emacs/site-lisp/auctex/texmathp
/usr/local/share/emacs/23.3/site-lisp/auctex/context hides 
/usr/share/emacs/site-lisp/auctex/context
/usr/local/share/emacs/23.3/site-lisp/auctex/font-latex hides 
/usr/share/emacs/site-lisp/auctex/font-latex
/usr/local/share/emacs/23.3/site-lisp/auctex/bib-cite hides 
/usr/share/emacs/site-lisp/auctex/bib-cite
/usr/local/share/emacs/23.3/site-lisp/auctex/toolbar-x hides 
/usr/share/emacs/site-lisp/auctex/toolbar-x
/usr/local/share/emacs/23.3/site-lisp/auctex/tex-style hides 
/usr/share/emacs/site-lisp/auctex/tex-style

Features:
(shadow sort mail-extr message sendmail ecomplete rfc822 mml mml-sec
mm-decode mm-bodies mm-encode mailcap mail-parse rfc2231 rfc2047 rfc2045
qp ietf-drums mailabbrev nnheader gmm-utils mailheader canlock sha1
hex-util hashcash mail-utils emacsbug dired multi-isearch pp cus-edit
autoconf autoconf-mode mule-util conf-mode newcomment ange-ftp
tramp-imap tramp-gw tramp-fish tramp-smb tramp-cache tramp-ftp
tramp-cmds tramp auth-source gnus-util netrc time-date shell
password-cache format-spec tramp-compat trampver vc-git js2-mode imenu
js2-indent js2-parse js2-browse js2-highlight js2-ast js2-messages
js2-scan js2-util js2-vars js2-externs css-mode apropos foldit
nxml-uchnm rng-xsd xsd-regexp rng-cmpct sgml-mode nxhtml-mode popcmp
url-expand url-util url-methods url-parse url-vars mm-util mail-prsvr
rngalt rng-nxml rng-valid rng-loc rng-uri rng-parse nxml-parse rng-match
rng-dt rng-util rng-pttrn nxml-ns nxml-mode nxml-outln nxml-rap
nxml-util nxml-glyph nxml-enc xmltok loadhist nxhtml-mumamo mumamo-fun
mumamo byte-opt warnings bytecomp byte-compile face-remap filladapt
flyspell completing-help recentf tree-widget wid-edit uniquify paren
savehist minibuf-eldef iswitchb icomplete whitespace autorevert time
as-external wrap-to-fill cus-start cus-load desktop server
nxhtml-autostart nxhtml-autoload majmodpri rnc-mode nxhtml-menu
web-autoload nxhtml-base php-mode etags cc-langs cc-mode cc-fonts
cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs speedbar
sb-image ezimage dframe lua-mode regexp-opt comint ring ropemacs pymacs
smart-quotes ffap ispell auto-dictionary-autoloads c-eldoc-autoloads
dictionary-autoloads diff-git-autoloads dired-isearch-autoloads
full-ack-autoloads guess-style-autoloads kill-ring-search-autoloads
magit-autoloads mv-shell-autoloads tumble-autoloads
http-post-simple-autoloads package reporter advice advice-preload
yasnippet help-fns derived edmacro kmacro easymenu assoc cl cl-19
muse-autoloads emacs-goodies-el emacs-goodies-custom
emacs-goodies-loaddefs easy-mmode bbdb-autoloads preview-latex tex-site
auto-loads tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win
x-dnd font-setting tool-bar dnd fontset image fringe lisp-mode register
page menu-bar rfn-eshadow timer select scroll-bar mldrag mouse jit-lock
font-lock syntax facemenu font-core frame cham georgian utf-8-lang
misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew
greek romanian slovak czech european ethiopic indian cyrillic chinese
case-table epa-hook jka-cmpr-hook help simple abbrev loaddefs button
minibuffer faces cus-face files text-properties overlay md5 base64
format env code-pages mule custom widget hashtable-print-readable
backquote make-network-process dbusbind system-font-setting
font-render-setting gtk x-toolkit x multi-tty emacs)

-- 
http://rrt.sc3d.org/