Path: utzoo!attcan!uunet!lll-winken!lll-crg.llnl.gov!casey From: casey@lll-crg.llnl.gov (Casey Leedom) Newsgroups: comp.windows.x Subject: Re: Small bug in util/imake.includes/Imake.rules Summary: Here are my final [tested] recommendations for fixing INSTALLFLAGS Message-ID: <14634@lll-winken.llnl.gov> Date: 13 Dec 88 21:28:54 GMT References: <14520@lll-winken.llnl.gov> <14522@lll-winken.llnl.gov> <14527@lll-winken.llnl.gov> Sender: usenet@lll-winken.llnl.gov Reply-To: casey@lll-crg.llnl.gov.UUCP (Casey Leedom) Organization: Lawrence Livermore National Laboratory Lines: 213 As per my earier posting, I tried making INSTBINFLAGS be the default INSTALLFLAGS. There were a few Imakefiles which used the default install flags even though they were installing non-executables, but over all, the number of changes is still very small: %%% util/imake.include/Imake.tmpl: %%% %%% Added InstNonExecFlags (INSTNONEXFLAGS) and InstScriptFlags %%% (INSTSCRIPTFLAGS). Made InstBinFlags be the default %%% INSTALLFLAGS. *** util/imake.includes/Imake.tmpl-dist Sun Oct 23 19:37:17 1988 --- util/imake.includes/Imake.tmpl Sat Dec 10 17:38:12 1988 *************** *** 333,338 **** --- 333,344 ---- #ifndef XAppLoadDir #define XAppLoadDir $(LIBDIR)/app-defaults #endif + #ifndef InstNonExecFlags + #define InstNonExecFlags + #endif + #ifndef InstScriptFlags + #define InstScriptFlags -m 0755 + #endif #ifndef InstBinFlags #define InstBinFlags -m 0755 #endif *************** *** 403,408 **** --- 409,417 ---- LIBMANDIR = LibmanDir /* man pages for library routines */ XAPPLOADDIR = XAppLoadDir /* application default resources */ + INSTALLFLAGS = InstBinFlags /* default is to install a binary */ + INSTNONEXFLAGS = InstNonExecFlags /* install flags for non executables */ + INSTSCRIPTFLAGS = InstScriptFlags /* install flags for scripts */ INSTBINFLAGS = InstBinFlags /* install flags for programs */ INSTUIDFLAGS = InstUidFlags /* install flags for setuid programs */ INSTLIBFLAGS = InstLibFlags /* install flags for libraries */ %%% util/imake.includes/Imake.rules: %%% %%% Changed InstallNonExec macro to use INSTNONEXFLAGS, %%% InstallScript macro to use INSTSCRIPTFLAGS. *** util/imake.includes/Imake.rules-dist Sun Oct 23 19:46:39 1988 --- util/imake.includes/Imake.rules Sat Dec 10 15:56:05 1988 *************** *** 150,156 **** */ #define InstallNonExec(file,dest) @@\ install:: file @@\ ! $(INSTALL) -c $(INSTALLFLAGS) file dest /* * Install a program --- 150,156 ---- */ #define InstallNonExec(file,dest) @@\ install:: file @@\ ! $(INSTALL) -c $(INSTNONEXFLAGS) file dest /* * Install a program *************** *** 171,177 **** */ #define InstallScript(program,dest) @@\ install:: program.script @@\ ! $(INSTALL) -c $(INSTALLFLAGS) program.script dest/program /* --- 171,177 ---- */ #define InstallScript(program,dest) @@\ install:: program.script @@\ ! $(INSTALL) -c $(INSTSCRIPTFLAGS) program.script dest/program /* %%% X11/bitmaps/Imakefile: %%% %%% Added ``INSTALLFLAGS = $(INSTNONEXFLAGS) *** X11/bitmaps/Imakefile-dist Sun Oct 23 18:49:48 1988 --- X11/bitmaps/Imakefile Sat Dec 10 15:40:28 1988 *************** *** 41,46 **** --- 41,48 ---- xlogo32 \ xlogo64 + INSTALLFLAGS = $(INSTNONEXFLAGS) + all:: MakeDirectories(install,$(INCDIR)/bitmaps) %%% fonts/bdf/*/Imakefile: %%% %%% Added ``INSTALLFLAGS = $(INSTNONEXFLAGS) *** fonts/bdf/100dpi/Imakefile-dist Mon Oct 24 18:40:54 1988 --- fonts/bdf/100dpi/Imakefile Sat Dec 10 15:41:38 1988 *************** *** 13,19 **** charI14.snf charI18.snf charI24.snf charR08.snf charR10.snf \ charR12.snf charR14.snf charR18.snf charR24.snf ! FONTINSTDIR = $(FONTDIR)/100dpi MakeFonts() --- 13,20 ---- charI14.snf charI18.snf charI24.snf charR08.snf charR10.snf \ charR12.snf charR14.snf charR18.snf charR24.snf ! INSTALLFLAGS = $(INSTNONEXFLAGS) ! FONTINSTDIR = $(FONTDIR)/100dpi MakeFonts() *** fonts/bdf/75dpi/Imakefile-dist Mon Oct 24 18:41:00 1988 --- fonts/bdf/75dpi/Imakefile Sat Dec 10 15:41:38 1988 *************** *** 53,59 **** charI14.snf charI18.snf charI24.snf charR08.snf charR10.snf \ charR12.snf charR14.snf charR18.snf charR24.snf ! FONTINSTDIR = $(FONTDIR)/75dpi MakeFonts() --- 53,60 ---- charI14.snf charI18.snf charI24.snf charR08.snf charR10.snf \ charR12.snf charR14.snf charR18.snf charR24.snf ! INSTALLFLAGS = $(INSTNONEXFLAGS) ! FONTINSTDIR = $(FONTDIR)/75dpi MakeFonts() *** fonts/bdf/misc/Imakefile-dist Sun Oct 23 19:25:38 1988 --- fonts/bdf/misc/Imakefile Sat Dec 10 15:41:38 1988 *************** *** 1,6 **** SRCS = 6x10.bdf 6x12.bdf 6x13.bdf 8x13.bdf 8x13B.bdf 9x15.bdf cursor.bdf OBJS = 6x10.snf 6x12.snf 6x13.snf 8x13.snf 8x13B.snf 9x15.snf cursor.snf ! FONTINSTDIR = $(FONTDIR)/misc MakeFonts() --- 1,8 ---- SRCS = 6x10.bdf 6x12.bdf 6x13.bdf 8x13.bdf 8x13B.bdf 9x15.bdf cursor.bdf OBJS = 6x10.snf 6x12.snf 6x13.snf 8x13.snf 8x13B.snf 9x15.snf cursor.snf ! ! INSTALLFLAGS = $(INSTNONEXFLAGS) ! FONTINSTDIR = $(FONTDIR)/misc MakeFonts() %%% clients/bitmap/Imakefile: %%% %%% Install bmtoa and atobm using INSTBINFLAGS. *** clients/bitmap/Imakefile-dist Thu Oct 13 10:23:49 1988 --- clients/bitmap/Imakefile Sat Dec 10 15:19:59 1988 *************** *** 9,16 **** ComplexProgramTarget_1(bitmap,$(XMULIB) $(XLIB),-lm) SingleProgramTarget(bmtoa,$(OBJS2),$(XMULIB),) SingleProgramTarget(atobm,$(OBJS3),,) ! InstallProgramWithFlags(bmtoa,$(BINDIR),) ! InstallProgramWithFlags(atobm,$(BINDIR),) /* ComplexProgramTarget_2(bmtoa,$(XMULIB),) ComplexProgramTarget_3(atobm,,) --- 9,16 ---- ComplexProgramTarget_1(bitmap,$(XMULIB) $(XLIB),-lm) SingleProgramTarget(bmtoa,$(OBJS2),$(XMULIB),) SingleProgramTarget(atobm,$(OBJS3),,) ! InstallProgram(bmtoa,$(BINDIR)) ! InstallProgram(atobm,$(BINDIR)) /* ComplexProgramTarget_2(bmtoa,$(XMULIB),) ComplexProgramTarget_3(atobm,,) %%% clients/xinit/Imakefile: %%% %%% Install startx with INSTSCRIPTFLAGS. *** clients/xinit/Imakefile-dist Sun Oct 23 13:59:11 1988 --- clients/xinit/Imakefile Sat Dec 10 17:38:23 1988 *************** *** 12,18 **** /* MakeScriptFromCpp(xserverrc, -DXINITDIR=$(XINITDIR)) */ ! InstallProgram(startx,$(BINDIR)) #if InstallxinitConfig MakeDirectories(install $(XINITDIR)) --- 12,18 ---- /* MakeScriptFromCpp(xserverrc, -DXINITDIR=$(XINITDIR)) */ ! InstallProgramWithFlags(startx,$(BINDIR),$(INSTSCRIPTFLAGS)) #if InstallxinitConfig MakeDirectories(install $(XINITDIR))